This is an automated email from the ASF dual-hosted git repository. kbowers pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-benchmarks.git
commit cf668a097769a547fc201b81135262fc2c5b44d2 Author: Marián Macik <[email protected]> AuthorDate: Thu Jun 3 15:55:10 2021 +0200 Remove commented code and a small refactor --- .../kie/kogito/benchmarks/framework/Commands.java | 4 +-- .../benchmarks/framework/HTTPRequestInfo.java | 39 ++++++++-------------- .../org/kie/kogito/benchmarks/framework/Logs.java | 2 -- .../benchmarks/framework/WhitelistLogLines.java | 2 -- .../kogito/benchmarks/AbstractTemplateTest.java | 7 ++-- 5 files changed, 18 insertions(+), 36 deletions(-) diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java index 37fe5b7..e57f32c 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Commands.java @@ -170,7 +170,6 @@ public class Commands { ExecutorService buildService = Executors.newFixedThreadPool(1); List<String> baseBuildCmd = new ArrayList<>(Arrays.asList(app.mavenCommands.mvnCmds[0])); - //baseBuildCmd.add("-Dquarkus.version=" + getQuarkusVersion()); List<String> cmd = getBuildCommand(baseBuildCmd.toArray(new String[0])); buildService.submit(new Commands.ProcessRunner(appDir, buildLogA, cmd, 20)); // TODO exit code handling @@ -230,9 +229,8 @@ public class Commands { .sorted(Comparator.reverseOrder()) .map(Path::toFile) .forEach(File::delete); - //FileUtils.forceDelete(new File(s)); } catch (IOException e) { - //Silence is golden + logger.warn("Unable to delete directories or files", e); } } } diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/HTTPRequestInfo.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/HTTPRequestInfo.java index 8c83b22..40bcf6c 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/HTTPRequestInfo.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/HTTPRequestInfo.java @@ -4,7 +4,14 @@ import java.util.HashMap; import java.util.Map; /** - * A class representing + * A class representing HTTP Request details such as: + * <ul> + * <li> URI</li> + * <li>Request body</li> + * <li>HTTP method</li> + * <li>HTTP headers</li> + * <li>Expected status code of the response</li> + * </ul> */ public class HTTPRequestInfo { @@ -14,26 +21,6 @@ public class HTTPRequestInfo { private Map<String, String> headers = new HashMap<>(); private int expectedResponseStatusCode; - private void setURI(String uri) { - this.uri = uri; - } - - private void setBody(String body) { - this.body = body; - } - - private void setMethod(String method) { - this.method = method; - } - - private void addHeader(String name, String value) { - this.headers.put(name, value); - } - - private void setExpectedResponseStatusCode(int expectedResponseStatusCode) { - this.expectedResponseStatusCode = expectedResponseStatusCode; - } - public String getURI() { return uri; } @@ -63,27 +50,27 @@ public class HTTPRequestInfo { private final HTTPRequestInfo instance = new HTTPRequestInfo(); public Builder URI(String uri) { - instance.setURI(uri); + instance.uri = uri; return this; } public Builder body(String body) { - instance.setBody(body); + instance.body = body; return this; } public Builder method(String method) { - instance.setMethod(method); + instance.method = method; return this; } public Builder header(String name, String value) { - instance.addHeader(name, value); + instance.headers.put(name, value); return this; } public Builder expectedResponseStatusCode(int statusCode) { - instance.setExpectedResponseStatusCode(statusCode); + instance.expectedResponseStatusCode = statusCode; return this; } diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Logs.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Logs.java index 4ec318e..a78c143 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Logs.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/Logs.java @@ -122,8 +122,6 @@ public class Logs { propPrefix += ".native"; } else if (cmd == MvnCmds.DEV) { propPrefix += ".dev"; - // } else if (cmd == MvnCmds.GENERATOR) { - // propPrefix += ".generated.dev"; } else { throw new IllegalArgumentException("Unexpected mode. Check MvnCmds.java."); } diff --git a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/WhitelistLogLines.java b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/WhitelistLogLines.java index d70315c..d2daa80 100644 --- a/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/WhitelistLogLines.java +++ b/kogito-benchmarks-framework/src/main/java/org/kie/kogito/benchmarks/framework/WhitelistLogLines.java @@ -4,8 +4,6 @@ import java.util.regex.Pattern; /** * Whitelists errors in log files. - * - * @author Michal Karm Babacek <[email protected]> */ public enum WhitelistLogLines { EVERYTHING(new Pattern[] { Pattern.compile(".*") }), diff --git a/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java b/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java index 80edb77..e5b299d 100644 --- a/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java +++ b/kogito-benchmarks-tests/src/test/java/org/kie/kogito/benchmarks/AbstractTemplateTest.java @@ -57,7 +57,7 @@ public abstract class AbstractTemplateTest { public static final String LOCALHOST = "http://localhost:8080";; public void startStop(TestInfo testInfo, App app) throws IOException, InterruptedException { - logger.info("Testing app startStop: " + app.toString() + ", mode: " + app.mavenCommands.toString()); + logger.info("Running startStop test. Testing app: " + app.toString() + ", mode: " + app.mavenCommands.toString()); Process pA = null; File buildLogA = null; @@ -186,7 +186,7 @@ public abstract class AbstractTemplateTest { } public void loadTest(TestInfo testInfo, App app, HTTPRequestInfo requestInfo) throws IOException, InterruptedException { - logger.info("Testing app loadTest: " + app.toString() + ", mode: " + app.mavenCommands.toString()); + logger.info("Running loadTest test. Testing app: " + app.toString() + ", mode: " + app.mavenCommands.toString()); Process pA = null; File buildLogA = null; @@ -345,7 +345,8 @@ public abstract class AbstractTemplateTest { appendln(whatIDidReport, "Measurements:"); appendln(whatIDidReport, log.headerMarkdown + "\n" + log.lineMarkdown); - //checkThreshold(app, mvnCmds, rssKbAvgWithoutMinMax, timeToFirstOKRequestAvgWithoutMinMax, SKIP); + // TODO check other load test-related metrics here, e.g. rssKbFinal + checkThreshold(app, mvnCmds, rssKb, runInfo.getTimeToFirstOKRequest(), SKIP); } finally { // Make sure processes are down even if there was an exception / failure if (pA != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
