Refactor MONITORS-DEFAULT.json profile to handle capturing all default monitoring information.

Author: brdeyo

VERSION

@@ -1 +1 @@
-2.1.13
+2.1.14

src/VirtualClient/VirtualClient.Contracts/VirtualClientComponent.cs

@@ -727,7 +727,6 @@ await this.Logger.LogMessageAsync($"{this.TypeName}.Execute", telemetryContext,
                         finally
                         {
                             this.EndTime = DateTime.UtcNow;
-
                             this.LogSuccessOrFailedMetric(succeeded, scenarioStartTime: this.StartTime, scenarioEndTime: this.EndTime, telemetryContext: telemetryContext);
                         }
 

src/VirtualClient/VirtualClient.Contracts/VirtualClientIntervalBasedMonitor.cs

@@ -17,7 +17,7 @@ public abstract class VirtualClientIntervalBasedMonitor : VirtualClientComponent
         /// The default frequency that monitors run at (every five minutes)
         /// </summary>
         private static TimeSpan defaultFrequency = TimeSpan.FromMinutes(5);
-        private static TimeSpan defaultWarmupPeriod = TimeSpan.FromMinutes(5);
+        private static TimeSpan defaultWarmupPeriod = TimeSpan.Zero;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="VirtualClientIntervalBasedMonitor"/> class.
@@ -52,8 +52,7 @@ public TimeSpan MonitorFrequency
         {
             get
             {
-                return this.Parameters.GetTimeSpanValue(
-                    nameof(VirtualClientIntervalBasedMonitor.MonitorFrequency), VirtualClientIntervalBasedMonitor.defaultFrequency);
+                return this.Parameters.GetTimeSpanValue(nameof(this.MonitorFrequency), VirtualClientIntervalBasedMonitor.defaultFrequency);
             }
         }
 
@@ -64,8 +63,7 @@ public TimeSpan MonitorWarmupPeriod
         {
             get
             {
-                return this.Parameters.GetTimeSpanValue(
-                    nameof(VirtualClientIntervalBasedMonitor.MonitorWarmupPeriod), VirtualClientIntervalBasedMonitor.defaultWarmupPeriod);
+                return this.Parameters.GetTimeSpanValue(nameof(this.MonitorWarmupPeriod), VirtualClientIntervalBasedMonitor.defaultWarmupPeriod);
             }
         }
 
@@ -77,8 +75,19 @@ public long MonitorIterations
         {
             get
             {
-                return this.Parameters.GetValue<long>(
-                    nameof(VirtualClientIntervalBasedMonitor.MonitorIterations), -1);
+                return this.Parameters.GetValue<long>(nameof(this.MonitorIterations), -1);
+            }
+        }
+
+        /// <summary>
+        /// Defines a monitoring strategy for more complex monitoring cadences.
+        /// </summary>
+        public MonitorStrategy? MonitorStrategy
+        {
+            get
+            {
+                this.Parameters.TryGetValue(nameof(this.MonitorStrategy), out IConvertible strategy);
+                return strategy != null ? Enum.Parse<MonitorStrategy>(strategy.ToString()) : null;
             }
         }
 

src/VirtualClient/VirtualClient.Core/SystemManagement.cs

@@ -277,9 +277,16 @@ public void EnableLongPathInWindows()
         /// <param name="cancellationToken">A token that can be used to cancel the wait operation.</param>
         public async Task WaitAsync(CancellationToken cancellationToken)
         {
-            while (!cancellationToken.IsCancellationRequested)
+            try
+            {
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    await Task.Delay(100, cancellationToken);
+                }
+            }
+            catch (OperationCanceledException)
             {
-                await Task.Delay(100, cancellationToken).ConfigureAwait(false);
+                // expected if the CancellationToken receives a cancellation request.
             }
         }
 
@@ -291,20 +298,27 @@ public async Task WaitAsync(CancellationToken cancellationToken)
         /// <param name="cancellationToken">A token that can be used to cancel the wait operation.</param>
         public async Task WaitAsync(DateTime timeout, CancellationToken cancellationToken)
         {
-            DateTime effectiveTimeout = timeout;
-            if (timeout.Kind != DateTimeKind.Utc)
-            {
-                effectiveTimeout = timeout.ToUniversalTime();
-            }
-
-            while (!cancellationToken.IsCancellationRequested)
+            try
             {
-                if (DateTime.UtcNow >= effectiveTimeout)
+                DateTime effectiveTimeout = timeout;
+                if (timeout.Kind != DateTimeKind.Utc)
                 {
-                    break;
+                    effectiveTimeout = timeout.ToUniversalTime();
                 }
 
-                await Task.Delay(100, cancellationToken).ConfigureAwait(false);
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    if (DateTime.UtcNow >= effectiveTimeout)
+                    {
+                        break;
+                    }
+
+                    await Task.Delay(100, cancellationToken);
+                }
+            }
+            catch (OperationCanceledException)
+            {
+                // expected if the CancellationToken receives a cancellation request.
             }
         }
 
@@ -314,9 +328,16 @@ public async Task WaitAsync(DateTime timeout, CancellationToken cancellationToke
         /// </summary>
         /// <param name="timeout">The maximum time to wait before continuing.</param>
         /// <param name="cancellationToken">A token that can be used to cancel the wait operation.</param>
-        public Task WaitAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public async Task WaitAsync(TimeSpan timeout, CancellationToken cancellationToken)
         {
-            return Task.Delay(timeout, cancellationToken);
+            try
+            {
+                await Task.Delay(timeout, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                // expected if the CancellationToken receives a cancellation request.
+            }
         }
 
         private async Task<CpuInfo> GetCpuInfoOnUnixAsync()