fixing command line and metadata

Author: nmalkapuram

src/VirtualClient/VirtualClient.Actions.UnitTests/Examples/Sysbench/SysbenchExample1.txt

@@ -0,0 +1,38 @@
+sysbench 1.1.0 (using bundled LuaJIT 2.1.0-beta3)
+
+Running the test with following options:
+Number of threads: 8
+Initializing random number generator from current time
+
+
+Initializing worker threads...
+
+Threads started!
+
+SQL statistics:
+    queries performed:
+        read:                            9720106
+        write:                           0
+        other:                           0
+        total:                           9720106
+    transactions:                        9720106 (32400.24 per sec.)
+    queries:                             9720106 (32400.24 per sec.)
+    ignored errors:                      0      (0.00 per sec.)
+    reconnects:                          0      (0.00 per sec.)
+
+Throughput:
+    events/s (eps):                      32400.2399
+    time elapsed:                        300.0011s
+    total number of events:              9720106
+
+Latency (ms):
+         min:                                    0.16
+         avg:                                    0.25
+         max:                                   13.68
+         95th percentile:                        0.28
+         sum:                              2389444.97
+
+Threads fairness:
+    events (avg/stddev):           1215013.2500/22596.17
+    execution time (avg/stddev):   298.6806/0.05
+

src/VirtualClient/VirtualClient.Actions.UnitTests/Sysbench/SysbenchMetricsParserTests.cs

@@ -46,5 +46,17 @@ public void SysbenchParserParsesCorrectly()
             MetricAssert.Exists(metrics, "latency p95", 68.05, "milliseconds");
             MetricAssert.Exists(metrics, "latency sum", 7458385.25, "milliseconds");
         }
+
+        [Test]
+        public void SysbenchParserParsesMetricsMetadataCorrectly()
+        {
+            string rawText = File.ReadAllText(Path.Combine(examplesDirectory, "SysbenchExample1.txt"));
+            SysbenchMetricsParser parser = new SysbenchMetricsParser(rawText);
+
+            IList<Metric> metrics = parser.Parse();
+            Assert.AreEqual(17, metrics.Count);
+            Assert.IsTrue(metrics[0].Metadata.ContainsKey("sysbench_version"));
+            Assert.IsTrue(metrics[0].Metadata["sysbench_version"].Equals("1.1.0"));
+        }
     }
 }

src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchClientExecutor.cs

@@ -10,6 +10,7 @@ namespace VirtualClient.Actions
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Identity.Client;
     using Polly;
     using VirtualClient.Common;
     using VirtualClient.Common.Extensions;
@@ -140,6 +141,20 @@ private void CaptureMetrics(IProcessProxy process, EventContext telemetryContext
                     {
                         SysbenchMetricsParser parser = new SysbenchMetricsParser(text);
                         IList<Metric> metrics = parser.Parse();
+                        string sysbenchVersion = null;
+
+                        var sysbenchVersionMetric = metrics.FirstOrDefault();
+                        if (sysbenchVersionMetric != null && sysbenchVersionMetric.Metadata.TryGetValue("sysbench_version", out var versionValue))
+                        {
+                            sysbenchVersion = versionValue?.ToString();
+                        }
+
+                        if (!string.IsNullOrEmpty(sysbenchVersion))
+                        {
+                            this.MetadataContract.Add("sysbench_version", sysbenchVersion, MetadataContractCategory.Dependencies);
+                        }
+
+                        this.MetadataContract.Apply(telemetryContext);
 
                         this.Logger.LogMetrics(
                             toolName: "Sysbench",
@@ -150,7 +165,8 @@ private void CaptureMetrics(IProcessProxy process, EventContext telemetryContext
                             null,
                             scenarioArguments: this.sysbenchLoggingArguments,
                             this.Tags,
-                            telemetryContext);
+                            telemetryContext,
+                            toolVersion: sysbenchVersion);
                     }
                     catch (Exception exc)
                     {
@@ -247,7 +263,7 @@ private async Task CleanUpDatabase(EventContext telemetryContext, CancellationTo
 
             using (IProcessProxy process = await this.ExecuteCommandAsync(
                 SysbenchExecutor.PythonCommand,
-                script + this.sysbenchExecutionArguments,
+                script + sysbenchCleanupArguments,
                 this.SysbenchPackagePath,
                 telemetryContext,
                 cancellationToken))
@@ -256,8 +272,6 @@ private async Task CleanUpDatabase(EventContext telemetryContext, CancellationTo
                 {
                     await this.LogProcessDetailsAsync(process, telemetryContext, "Sysbench", logToFile: true);
                     process.ThrowIfErrored<WorkloadException>(process.StandardError.ToString(), ErrorReason.WorkloadFailed);
-
-                    this.CaptureMetrics(process, telemetryContext, cancellationToken);
                 }
             }
         }

src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchConfiguration.cs

@@ -82,7 +82,7 @@ private async Task PrepareOLTPMySQLDatabase(EventContext telemetryContext, Cance
             int threadCount = GetThreadCount(this.SystemManager, this.DatabaseScenario, this.Threads);
             int recordCount = GetRecordCount(this.SystemManager, this.DatabaseScenario, this.RecordCount);
 
-            string sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --tableCount {tableCount} --recordCount {recordCount} --threadCount {threadCount}";
+            string sysbenchLoggingArguments = $"--dbName {this.DatabaseName} --databaseSystem {this.DatabaseSystem} --benchmark {this.Benchmark} --threadCount {threadCount} --tableCount {tableCount} --recordCount {recordCount}";
             this.sysbenchPrepareArguments = $"{sysbenchLoggingArguments} --password {this.SuperUserPassword}";
 
             string serverIp = "localhost";

src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchExecutor.cs

@@ -417,7 +417,7 @@ protected void AddMetric(string arguments, IProcessProxy process, EventContext t
 
                 List<Metric> metrics = new List<Metric>();
                 double duration = (process.ExitTime - process.StartTime).TotalMinutes;
-                metrics.Add(new Metric("PopulateDatabaseTime_Minutes", duration, "minutes", MetricRelativity.LowerIsBetter));
+                metrics.Add(new Metric("PopulateDatabaseDuration", duration, "minutes", MetricRelativity.LowerIsBetter));
 
                 this.Logger.LogMetrics(
                     toolName: "Sysbench",

src/VirtualClient/VirtualClient.Actions/Sysbench/SysbenchMetricsParser.cs

@@ -33,7 +33,7 @@ public SysbenchMetricsParser(string rawText)
         /// <inheritdoc/>
         public override IList<Metric> Parse()
         {
-            var match = Regex.Match(this.RawText, @"sysbench\s+([\d\.]+-[\w\d]+)");
+            var match = Regex.Match(this.RawText, @"sysbench\s+([\d]+\.[\d]+\.[\d]+(?:-\w+)?)");
             string sysbenchversion = match.Success ? match.Groups[1].Value : string.Empty;
             this.metricMetadata["sysbench_version"] = sysbenchversion;
             this.Preprocess();

src/VirtualClient/VirtualClient.Main/profiles/PERF-POSTGRESQL-SYSBENCH-OLTP.json

@@ -182,7 +182,7 @@
             "Parameters": {
                 "Scenario": "DownloadSysbenchPackage",
                 "BlobContainer": "packages",
-                "BlobName": "sysbench-1.0.20.rev2.zip",
+                "BlobName": "sysbench-1.0.20.rev3.zip",
                 "PackageName": "sysbench",
                 "Extract": true
             }