Skip to content

fix: Cannot build quick perf from sources #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ jobs:
name: Java ${{ matrix.java }}
strategy:
matrix:
java: [8, 11, 12, 13, 14, 15, 16, 17]
java: [17]
env:
REPO_SLUG: ${{ github.repository }}
BRANCH: ${{ github.head_ref }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -32,18 +33,19 @@ jobs:
name: Java ${{ matrix.java }}
strategy:
matrix:
java: [11]
java: [17]
env:
REPO_SLUG: ${{ github.repository }}
BRANCH: ${{ github.head_ref }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -56,18 +58,19 @@ jobs:
name: Java ${{ matrix.java }}
strategy:
matrix:
java: [11]
java: [17]
env:
REPO_SLUG: ${{ github.repository }}
BRANCH: ${{ github.head_ref }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand All @@ -80,18 +83,19 @@ jobs:
name: Java ${{ matrix.java }}
strategy:
matrix:
java: [11]
java: [17]
env:
REPO_SLUG: ${{ github.repository }}
BRANCH: ${{ github.head_ref }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Cache Maven dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
3 changes: 0 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<artifactId>quick-perf-core</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<javadoc-subpackages>org.quickperf.annotation,org.quickperf.config</javadoc-subpackages>
</properties>

Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-12-jvm-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<artifactId>quick-perf-junit4-12-jvm-test</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-13-1-jvm-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<artifactId>quick-perf-junit4-13-1-jvm-test</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-13-2-jvm-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<artifactId>quick-perf-junit4-13-2-jvm-test</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-13-jvm-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<artifactId>quick-perf-junit4-13-jvm-test</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-5-jvm-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<artifactId>quick-perf-junit4-5-jvm-test</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-runner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<artifactId>quick-perf-junit4</artifactId>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
<javadoc-sourceFileIncludes>**\/\QuickPerfJUnitRunner.java</javadoc-sourceFileIncludes>
</properties>

Expand Down
3 changes: 0 additions & 3 deletions junit4/junit4-sql-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
<artifactId>quick-perf-junit4-sql-test</artifactId>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<dependencies.max.jdk.version>1.8</dependencies.max.jdk.version>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
Expand Down
1 change: 1 addition & 0 deletions junit5/junit5-test-util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<gpg.skip>true</gpg.skip>
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
<allowIncompleteProjects>true</allowIncompleteProjects>
</properties>

<build>
Expand Down
3 changes: 0 additions & 3 deletions junit5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<packaging>pom</packaging>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<dependencies.max.jdk.version>8</dependencies.max.jdk.version>
<junit5.jupiter.version>5.6.2</junit5.jupiter.version>
<junit5.platform.version>1.6.2</junit5.platform.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions jvm/jfr-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
<dependency>
<groupId>org.openjdk.jmc</groupId>
<artifactId>flightrecorder.rules.jdk</artifactId>
<version>7.1.1</version>
<version>9.1.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.11.1</version>
<version>1.15.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,16 @@
package org.quickperf.jvm.jmcrule;

import org.jsoup.Jsoup;
import org.jsoup.examples.HtmlToPlainText;
import org.jsoup.nodes.Document;

class HtmlToPlainTextTransformer {

public static final HtmlToPlainTextTransformer INSTANCE = new HtmlToPlainTextTransformer();

public String convertHtmlToPlainText(String html) {
HtmlToPlainText htmlToPlainText = new HtmlToPlainText();
Document jsoupDocument = Jsoup.parse(html);
jsoupDocument.select("p").prepend("<br>");
return htmlToPlainText.getPlainText(jsoupDocument);
return jsoupDocument.text();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@

import org.openjdk.jmc.common.item.IItemCollection;
import org.openjdk.jmc.common.util.IPreferenceValueProvider;
import org.openjdk.jmc.flightrecorder.rules.IRule;
import org.openjdk.jmc.flightrecorder.rules.Result;
import org.openjdk.jmc.flightrecorder.rules.RuleRegistry;
import org.openjdk.jmc.flightrecorder.rules.Severity;
import org.openjdk.jmc.flightrecorder.rules.*;

import org.quickperf.ExtractablePerformanceMeasure;
import org.quickperf.jvm.jfr.JfrRecording;
import org.quickperf.unit.Count;
Expand All @@ -39,20 +37,21 @@ private JmcRuleCountMeasureExtractor() {}
public JmcRulesMeasure extractPerfMeasureFrom(JfrRecording jfrRecording) {

IItemCollection jfrEvents = jfrRecording.getJfrEvents();
List<Result> ruleEvaluations = evaluateJmcRules(jfrEvents);
List<IResult> ruleEvaluations = evaluateJmcRules(jfrEvents);

List<Count> jmcRules = buildJmcRuleCountsFrom(ruleEvaluations);

return new JmcRulesMeasure(jmcRules);

}

private List<Result> evaluateJmcRules(IItemCollection jfrEvents) {
List<Result> ruleEvaluations = new ArrayList<>();
private List<IResult> evaluateJmcRules(IItemCollection jfrEvents) {
List<IResult> ruleEvaluations = new ArrayList<>();
for (IRule rule : RuleRegistry.getRules()) {
RunnableFuture<Result> future = rule.evaluate(jfrEvents, IPreferenceValueProvider.DEFAULT_VALUES);
RunnableFuture<IResult> future = rule.createEvaluation(jfrEvents,
IPreferenceValueProvider.DEFAULT_VALUES, new ResultProvider());
future.run();
Result result;
IResult result;
try {
result = future.get();
} catch (InterruptedException | ExecutionException e) {
Expand All @@ -63,9 +62,9 @@ private List<Result> evaluateJmcRules(IItemCollection jfrEvents) {
return ruleEvaluations;
}

private List<Count> buildJmcRuleCountsFrom(List<Result> ruleEvaluations) {
private List<Count> buildJmcRuleCountsFrom(List<IResult> ruleEvaluations) {
List<Count> jmcRules = new ArrayList<>();
for (Result ruleEvaluation : ruleEvaluations) {
for (IResult ruleEvaluation : ruleEvaluations) {
Count ruleScore = buildJmcRuleCountFrom(ruleEvaluation);
if(!ruleToExclude(ruleScore)) {
jmcRules.add(ruleScore);
Expand All @@ -82,15 +81,15 @@ private boolean ruleToExclude(Count ruleScore) {
|| ruleDescription.contains("Rule: Metaspace Live Set Trend");
}

private Count buildJmcRuleCountFrom(Result result) {
private Count buildJmcRuleCountFrom(IResult result) {
StringWriter stringWriter = new StringWriter();

PrintWriter printWriter = new PrintWriter(stringWriter);
printWriter.println("Rule: " + result.getRule().getName());
printWriter.println("Severity: " + Severity.get(result.getScore()));
long score = (long) result.getScore();
printWriter.println("Severity: " + result.getSeverity());
long score = (long) result.getSeverity().getLimit();
printWriter.println("Score: " + score);
String longDescriptionAsHtml = result.getLongDescription();
String longDescriptionAsHtml = result.getExplanation();
String textDesc = HtmlToPlainTextTransformer.INSTANCE.convertHtmlToPlainText(longDescriptionAsHtml);
printWriter.println("Message: " + textDesc);

Expand Down
3 changes: 0 additions & 3 deletions jvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<packaging>pom</packaging>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<dependencies.max.jdk.version>1.7</dependencies.max.jdk.version>
</properties>

<modules>
Expand Down
Loading