Support liberty_throughput_dt10 in Traffic Light

resolves: automation/issues/540
Signed-off-by: Lan Xia <Lan_Xia@ca.ibm.com>

Author: llxia

TestResultSummaryService/parsers/BenchmarkMetric.js

@@ -109,21 +109,34 @@ const BenchmarkMetricRegex = {
         },
     },
     liberty_throughput_dt10: {
-        //Example: Running 1 measures...
-        outerRegex: /Running \d* measures([\s\S\n]*)/,
+        outerRegex: /<run runNo="5" runType="measure"([\s\S\n]*)/,
         metrics: {
-            Footprint: {
-                //Example: Footprint (kb)=168940
+            Throughput: {
+                //Example: <metric type="throughput">\n<data machine="lance10G" units="req/sec">63.4</data>
+                regex: /<metric type="throughput">[\s\S\n]*?(\d*\.?\d*)<\/data>/,
+                higherbetter: true,
+                units: 'ops/s',
+            },
+            'CPU Util pct': {
+                //Example: <data machine="wehrlein10G" units="%" cv="1.0064976672229644">15.139217146458863</data>
+                regex: /<metric type="CPU Utilization">[\s\S\n]*?<\/data>[\s\S\n]*?<data[\s\S\n]*?>(\d*\.?\d*)*/,
+                higherbetter: false,
+                units: '%',
+            },
+            'JIT CPU total ms': {
+                //Example: #PERF:  Time spent in compilation thread =22323 ms
+                //JITCPUtotal is sum of all JIT CPU usage use values in verbose logs
+                regex: /#PERF[\s\S\n]*?compilation thread =(\d*\.?\d*)[\s\S\n]*?/,
+                higherbetter: false,
+                units: '%',
+                funcName: math.sum,
+            },
+            'Adjusted Single Server Memory (Footprint)': {
+                //Example: Footprint (kb)=589444
                 regex: /Footprint \(kb\)=(\d*\.?\d*)/,
                 higherbetter: false,
                 units: 'kb',
             },
-            Throughput: {
-                //Example: Page throughput = 2923.0 /s
-                regex: /Page throughput = (\d*\.?\d*)/,
-                higherbetter: true,
-                units: 'req/sec',
-            },
         },
     },
     bumbleBench: {

TestResultSummaryService/parsers/Utils.js

@@ -50,6 +50,7 @@ class Utils {
             for (let i = 0; i < curMetricList.length; i++) {
                 curMetric = curMetricList[i];
                 curRegex = curBenchVariant['metrics'][curMetric]['regex'];
+                console.log('curRegex: ', curRegex);
                 /*	Parse all values for single metric from result to an array
                  *  e.g
                  *  Liberty Startup =>
@@ -58,11 +59,13 @@ class Utils {
                  *  curRegexResult = ['<metric type="throughput">32<\/data>',32]
                  */
                 curRegexResult = testOutput.split(curRegex);
+                console.log('curRegexResult: ', curRegexResult);
                 //collect only the capture groups from the regex array
                 curRegexResult = curRegexResult.filter(
                     (value, index) => index % 2 === 1
                 );
                 curMetricValues = curRegexResult.map(parseFloat);
+                console.log('curMetricValues: ', curMetricValues);
                 /* Metrics such as JITCPU total in LibertyThroughput and geomean_GCA in CryptoBB,
                  * require aggregate function to be applied.
                  * e.g JIT CPU total values are collected as [ 0,0,300,200,20 ] but we display 520 as the JITCPU total
@@ -78,6 +81,8 @@ class Utils {
                         ),
                     ];
                 }
+                console.log('curMetric: ', curMetric);
+                console.log('curMetricValues: ', curMetricValues);
                 curTestData['metrics'].push({
                     name: curMetric,
                     value: curMetricValues,