Standardized support for filtering metrics using verbosity levels, inclusion and exclusion regex.

src/VirtualClient/VirtualClient.Actions/3DMark/ThreeDMarkMetricsParser.cs

@@ -41,15 +41,15 @@ public override IList<Metric> Parse()
             {
                 if (this.Defintion == "custom_TSGT1.3dmdef")
                 {
-                    metrics.Add(new Metric("timespy.graphics.1 [fps]", this.ParseXMLTag("TimeSpyPerformanceGraphicsTest1"), "fps", MetricRelativity.HigherIsBetter, verbosity: 0));
+                    metrics.Add(new Metric("timespy.graphics.1 [fps]", this.ParseXMLTag("TimeSpyPerformanceGraphicsTest1"), "fps", MetricRelativity.HigherIsBetter, verbosity: 1));
                 }
                 else if (this.Defintion == "custom_TSGT2.3dmdef")
                 {
-                    metrics.Add(new Metric("timespy.graphics.2 [fps]", this.ParseXMLTag("TimeSpyPerformanceGraphicsTest2"), "fps", MetricRelativity.HigherIsBetter, verbosity: 0));
+                    metrics.Add(new Metric("timespy.graphics.2 [fps]", this.ParseXMLTag("TimeSpyPerformanceGraphicsTest2"), "fps", MetricRelativity.HigherIsBetter, verbosity: 1));
                 }
                 else if (this.Defintion == "custom_TSCT.3dmdef")
                 {
-                    metrics.Add(new Metric("timespy.cpu [fps]", this.ParseXMLTag("TimeSpyPerformanceCpuSection2"), "fps", MetricRelativity.HigherIsBetter, verbosity: 0));
+                    metrics.Add(new Metric("timespy.cpu [fps]", this.ParseXMLTag("TimeSpyPerformanceCpuSection2"), "fps", MetricRelativity.HigherIsBetter, verbosity: 1));
                 }
             }
             catch (Exception exc)

src/VirtualClient/VirtualClient.Actions/7zip/Compression7zipMetricsParser.cs

@@ -62,11 +62,11 @@ public override IList<Metric> Parse()
             int rows = this.SizeAndTime.Rows.Count;
 
             metrics.Add(new Metric(
-                "Compression_Ratio", 
-                (Convert.ToDouble(this.SizeAndTime.Rows[2].ItemArray[2]) / Convert.ToDouble(this.SizeAndTime.Rows[0].ItemArray[2])) * 100, 
+                "Compression_Ratio",
+                (Convert.ToDouble(this.SizeAndTime.Rows[2].ItemArray[2]) / Convert.ToDouble(this.SizeAndTime.Rows[0].ItemArray[2])) * 100,
                 "precentage",
-                relativity: MetricRelativity.LowerIsBetter, 
-                verbosity: 2));
+                relativity: MetricRelativity.LowerIsBetter,
+                verbosity: 5));
 
             double compressionTime = 0;
 
@@ -75,7 +75,7 @@ public override IList<Metric> Parse()
                 compressionTime += Convert.ToDouble(this.SizeAndTime.Rows[i].ItemArray[2]);
             }
 
-            metrics.Add(new Metric("Compression_Time", compressionTime, MetricUnit.Seconds, MetricRelativity.LowerIsBetter, verbosity: 0));
+            metrics.Add(new Metric("Compression_Time", compressionTime, MetricUnit.Seconds, MetricRelativity.LowerIsBetter, verbosity: 1));
 
             return metrics;
         }

src/VirtualClient/VirtualClient.Actions/ASPNET/BombardierMetricsParser.cs

@@ -32,18 +32,18 @@ public override IList<Metric> Parse()
             this.metrics = new List<Metric>();
 
             Root root = JsonSerializer.Deserialize<Root>(this.PreprocessedText);
-            this.metrics.Add(new Metric("Latency Max", root.Result.Latency.Max, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 2));
+            this.metrics.Add(new Metric("Latency Max", root.Result.Latency.Max, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 5));
             this.metrics.Add(new Metric("Latency Average", root.Result.Latency.Mean, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter));
-            this.metrics.Add(new Metric("Latency Stddev", root.Result.Latency.Stddev, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 2));
-            this.metrics.Add(new Metric("Latency P50", root.Result.Latency.Percentiles.P50, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 0));
+            this.metrics.Add(new Metric("Latency Stddev", root.Result.Latency.Stddev, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 5));
+            this.metrics.Add(new Metric("Latency P50", root.Result.Latency.Percentiles.P50, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 1));
             this.metrics.Add(new Metric("Latency P75", root.Result.Latency.Percentiles.P75, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter));
             this.metrics.Add(new Metric("Latency P90", root.Result.Latency.Percentiles.P90, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter));
             this.metrics.Add(new Metric("Latency P95", root.Result.Latency.Percentiles.P95, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter));
-            this.metrics.Add(new Metric("Latency P99", root.Result.Latency.Percentiles.P99, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 0));
+            this.metrics.Add(new Metric("Latency P99", root.Result.Latency.Percentiles.P99, MetricUnit.Microseconds, MetricRelativity.LowerIsBetter, verbosity: 1));
 
-            this.metrics.Add(new Metric("RequestPerSecond Max", root.Result.Rps.Max, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 2));
-            this.metrics.Add(new Metric("RequestPerSecond Average", root.Result.Rps.Mean, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 0));
-            this.metrics.Add(new Metric("RequestPerSecond Stddev", root.Result.Rps.Stddev, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 2));
+            this.metrics.Add(new Metric("RequestPerSecond Max", root.Result.Rps.Max, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 5));
+            this.metrics.Add(new Metric("RequestPerSecond Average", root.Result.Rps.Mean, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 1));
+            this.metrics.Add(new Metric("RequestPerSecond Stddev", root.Result.Rps.Stddev, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter, verbosity: 5));
             this.metrics.Add(new Metric("RequestPerSecond P50", root.Result.Rps.Percentiles.P50, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter));
             this.metrics.Add(new Metric("RequestPerSecond P75", root.Result.Rps.Percentiles.P75, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter));
             this.metrics.Add(new Metric("RequestPerSecond P90", root.Result.Rps.Percentiles.P90, MetricUnit.RequestsPerSec, MetricRelativity.HigherIsBetter));

src/VirtualClient/VirtualClient.Actions/CoreMark/CoreMarkMetricsParser.cs

@@ -46,23 +46,23 @@ public override IList<Metric> Parse()
             metrics.AddRange(this.CoreMarkResult.GetMetrics(nameIndex: 0, valueIndex: 1, unit: "NA", namePrefix: string.Empty, ignoreFormatError: true));
             // CoreMark result doesn't define the unit so needs manually assign units.
             metrics.Where(m => m.Name == "CoreMark Size").FirstOrDefault().Unit = "bytes";
-            metrics.Where(m => m.Name == "CoreMark Size").FirstOrDefault().Verbosity = 2;
+            metrics.Where(m => m.Name == "CoreMark Size").FirstOrDefault().Verbosity = 5;
             metrics.Where(m => m.Name == "Total ticks").FirstOrDefault().Unit = "ticks";
-            metrics.Where(m => m.Name == "Total ticks").FirstOrDefault().Verbosity = 2;
+            metrics.Where(m => m.Name == "Total ticks").FirstOrDefault().Verbosity = 5;
             metrics.Where(m => m.Name == "Total time (secs)").FirstOrDefault().Unit = "secs";
-            metrics.Where(m => m.Name == "Total time (secs)").FirstOrDefault().Verbosity = 2;
+            metrics.Where(m => m.Name == "Total time (secs)").FirstOrDefault().Verbosity = 5;
             metrics.Where(m => m.Name == "Iterations/Sec").FirstOrDefault().Unit = "iterations/sec";
             metrics.Where(m => m.Name == "Iterations/Sec").FirstOrDefault().Relativity = MetricRelativity.HigherIsBetter;
-            metrics.Where(m => m.Name == "Iterations/Sec").FirstOrDefault().Verbosity = 0;
+            metrics.Where(m => m.Name == "Iterations/Sec").FirstOrDefault().Verbosity = 1;
             metrics.Where(m => m.Name == "Iterations").FirstOrDefault().Unit = "iterations";
             metrics.Where(m => m.Name == "Iterations").FirstOrDefault().Relativity = MetricRelativity.Undefined;
-            metrics.Where(m => m.Name == "Iterations").FirstOrDefault().Verbosity = 2;
+            metrics.Where(m => m.Name == "Iterations").FirstOrDefault().Verbosity = 5;
 
             // This line won't be there if it's running single thread.
             if (metrics.Any(m => m.Name == "Parallel PThreads"))
             {
                 metrics.Where(m => m.Name == "Parallel PThreads").FirstOrDefault().Unit = "threads";
-                metrics.Where(m => m.Name == "Parallel PThreads").FirstOrDefault().Verbosity = 2;
+                metrics.Where(m => m.Name == "Parallel PThreads").FirstOrDefault().Verbosity = 5;
             }
 
             return metrics;