Initial check in for Perf Traffic Light

TestResultSummaryService/DataManager.js

@@ -26,7 +26,7 @@ class DataManager {
             Object.keys(Parsers).map(async (type) => {
                 if (Parsers[type].canParse(buildName, output)) {
                     const parser = new Parsers[type](buildName);
-                    return await parser.parse(output);
+                    return await parser.parse(output, buildName);
                 }
             })
         );

TestResultSummaryService/package.json

@@ -34,6 +34,7 @@
         "got": "^11.8.5",
         "jenkins-api": "^0.3.1",
         "jsonwebtoken": "^9.0.0",
+        "lodash": "^4.17.21",
         "mathjs": "^7.6.0",
         "mongodb": "^3.6.10",
         "request": "^2.88.2",

TestResultSummaryService/parsers/Build.js

@@ -2,7 +2,7 @@ const Parser = require('./Parser');
 
 //ToDo: this is a place holder for build
 class Build extends Parser {
-    static canParse(buildName, output) {
+    static canParse(buildName) {
         return (
             buildName.match(/^Build-/) ||
             buildName.match(/IBMJAVA-build/) ||
@@ -12,10 +12,14 @@ class Build extends Parser {
         );
     }
 
-    parse(output) {
+    parse(output, buildName) {
+        let type = 'Build';
+        if (buildName.match(/^Perf_openjdk/)) {
+            type = 'Perf';
+        }
         return {
             build: null,
-            type: 'Build',
+            type,
             machine: this.extractMachineInfo(output),
         };
     }

TestResultSummaryService/parsers/Parser.js

@@ -27,7 +27,7 @@ class Parser {
         curRegexResult = null;
         // parse jdk date from javaVersion
         if ((curRegexResult = javaBuildDateRegex.exec(javaVersion)) !== null) {
-            jdkDate = curRegexResult[0];
+            jdkDate = curRegexResult[0].trim();
         }
         return { javaVersion, jdkDate, sdkResource };
     }

TestResultSummaryService/perf/DataManagerAggregate.js

@@ -6,6 +6,7 @@ class DataManagerAggregate {
     static aggDataCollect(childBuild) {
         let aggRawMetricValues = {};
         if (Array.isArray(childBuild.tests) && childBuild.tests.length > 0) {
+            const { buildName } = childBuild;
             for (let {
                 benchmarkName,
                 benchmarkVariant,
@@ -19,8 +20,7 @@ class DataManagerAggregate {
                     testData.metrics.length > 0
                 ) {
                     // Example: Jenkins build (running 2 benchmarks with 2 iterations) in this order: Benchmark_1, Benchmark_2, Benchmark_1, Benchmark_2.
-                    let name_variant_key =
-                        benchmarkName + '&&' + benchmarkVariant; //use benchmarkName and benchmarkVariant to make a unique name_variant key
+                    let name_variant_key = `${benchmarkName}&&${benchmarkVariant}&&${buildName}`; //use benchmarkName and benchmarkVariant to make a unique name_variant key
                     /**
                      * Check aggRawMetricValues JSON object and see if it could include an existing name_variant key,
                      * If yes, we should concatenate our raw value collections to the end of the existing name_variant value
@@ -67,15 +67,20 @@ class DataManagerAggregate {
          */
         let validAggregateInfo = true;
         const aggregateInfo = [];
-        let benchmarkName, benchmarkVariant;
+        let benchmarkName, benchmarkVariant, buildName;
         if (
             ((jdkDate && javaVersion) || (nodeRunDate && nodeVersion)) &&
             aggRawMetricValues &&
             Object.keys(aggRawMetricValues).length > 0
         ) {
             Object.keys(aggRawMetricValues).forEach(function (name_variant) {
-                benchmarkName = name_variant.split('&&')[0];
-                benchmarkVariant = name_variant.split('&&')[1];
+                const tokens = name_variant.split('&&');
+                if (tokens.length === 3) {
+                    benchmarkName = tokens[0];
+                    benchmarkVariant = tokens[1];
+                    buildName = tokens[2];
+                }
+
                 const metrics = [];
                 let benchmarkMetricsCollection =
                     aggRawMetricValues[name_variant];
@@ -130,6 +135,7 @@ class DataManagerAggregate {
                 aggregateInfo.push({
                     benchmarkName,
                     benchmarkVariant,
+                    buildName,
                     metrics,
                 });
             });
@@ -141,6 +147,7 @@ class DataManagerAggregate {
             for (let {
                 benchmarkName,
                 benchmarkVariant,
+                buildName,
                 metrics,
             } of aggregateInfo) {
                 if (

TestResultSummaryService/plugins/DataManagerPerf.js

@@ -7,7 +7,7 @@ module.exports.onBuildDone = async (task, { testResultsDB, logger }) => {
         task.buildName,
         task.buildNum
     );
-    if (task.type === 'Perf') {
+    if (task.type === 'Perf' || task.buildName.match(/^Perf_openjdk/)) {
         if (!task.aggregateInfo) {
             let jdkDate, javaVersion, nodeRunDate, nodeVersion;
             let aggRawMetricValuesOfChildren = {}; //aggRawMetricValuesOfChildren is a new aggregate collection used to collect all children's aggRawMetricValues

TestResultSummaryService/routes/getBenchmarkMetricProps.js

@@ -2,9 +2,13 @@ const benchmarkMetric = require('../parsers/BenchmarkMetric');
 const utils = require('../parsers/Utils');
 module.exports = async (req, res) => {
     const { benchmarkName } = req.query;
-    const key = utils.getBenchmarkParserKey(benchmarkName);
-    if (key) {
-        res.json(benchmarkMetric[key]['metrics']);
+    if (benchmarkName) {
+        const key = utils.getBenchmarkParserKey(benchmarkName);
+        if (key) {
+            res.json(benchmarkMetric[key]['metrics']);
+        }
+    } else {
+        res.json(benchmarkMetric);
     }
     res.json();
 };

TestResultSummaryService/routes/getTrafficLightData.js

@@ -0,0 +1,41 @@
+const { TestResultsDB } = require('../Database');
+const ObjectID = require('mongodb').ObjectID;
+
+module.exports = async (req, res) => {
+    const db = new TestResultsDB();
+    let results = null;
+    let rootBuildId;
+    if (req.query.rootBuildId) {
+        rootBuildId = new ObjectID(req.query.rootBuildId);
+    }
+    let query = {
+        buildName: {
+            $regex: 'Perf_openjdk.*perf_.*(?<!test|baseline)$',
+        },
+        rootBuildId,
+    };
+    if (req.query.buildType === 'baseline' || req.query.buildType === 'test') {
+        const aggregateInfoBuildNameRegex = `.*_${req.query.buildType}`;
+        results = await db.aggregate([
+            {
+                $match: query,
+            },
+            // Needed to access values inside array
+            { $unwind: '$aggregateInfo' },
+            {
+                $match: {
+                    'aggregateInfo.buildName': {
+                        $regex: aggregateInfoBuildNameRegex,
+                    },
+                },
+            },
+            {
+                $project: {
+                    aggregateInfo: 1,
+                    buildName: 1,
+                },
+            },
+        ]);
+    }
+    res.send(results);
+};

TestResultSummaryService/routes/index.js

@@ -29,6 +29,7 @@ app.get('/getLastBuildInfo', require('./getLastBuildInfo'));
 app.get('/getLogStream', require('./getLogStream'));
 app.get('/getOutputById', require('./getOutputById'));
 app.get('/getOutputByTestInfo', require('./getOutputByTestInfo'));
+app.get('/getTrafficLightData', require('./getTrafficLightData'));
 app.get('/getTestAvgDuration', require('./getTestAvgDuration'));
 app.get('/getTestInfoByBuildInfo', require('./getTestInfoByBuildInfo'));
 app.get('/getAzDoRun', require('./getAzDoRun'));

test-result-summary-client/src/AdvancedSearch/InputSelect.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Select } from 'antd';
 
-export default class InoutSelect extends Component {
+export default class InputSelect extends Component {
     render() {
         const options = this.props.options.map((value) => ({ value }));
         return (

test-result-summary-client/src/App.jsx

@@ -11,6 +11,7 @@ import { TestCompare } from './TestCompare/';
 import { ThirdPartyAppView } from './ThirdPartyAppView/';
 import { PerfCompare } from './PerfCompare/';
 import { TabularView } from './TabularView/';
+import { TrafficLight } from './TrafficLight/';
 import { AdvancedSearch } from './AdvancedSearch/';
 
 import {
@@ -141,6 +142,14 @@ export default class App extends Component {
                                                     </Link>
                                                 ),
                                             },
+                                            {
+                                                key: 'sub4',
+                                                label: (
+                                                    <Link to="/trafficLight">
+                                                        Traffic Light
+                                                    </Link>
+                                                ),
+                                            },
                                         ],
                                     },
                                     {
@@ -221,6 +230,10 @@ export default class App extends Component {
                                             path="/tabularView"
                                             element={<TabularView />}
                                         />
+                                        <Route
+                                            path="/trafficLight"
+                                            element={<TrafficLight />}
+                                        />
                                         <Route
                                             path="/buildDetail"
                                             element={<BuildDetail />}

test-result-summary-client/src/Components/Button.jsx

@@ -0,0 +1,21 @@
+import { Button as AntdButton, Spin } from 'antd';
+import { useState } from 'react';
+export const Button = ({ children, ...props }) => {
+    const [loading, setLoading] = useState(false);
+    const onClick = async (...args) => {
+        try {
+            setLoading(true);
+            await props.onClick(...args);
+        } finally {
+            setLoading(false);
+        }
+    };
+    return (
+        <>
+            <AntdButton {...props} onClick={onClick}>
+                {children}
+            </AntdButton>
+            {loading && <Spin />}
+        </>
+    );
+};