SJSW Integration

dependency/src/main/java/de/dagere/peass/execution/gradle/GradleTestExecutor.java

@@ -146,6 +146,22 @@ public void executeTest(final TestMethodCall test, final File logFolder, final l
       cleanAboveSize(logFolder, "txt");
    }
 
+   @Override
+   public void executeTest(String javaAgent, final TestMethodCall test, final File logFolder, final long timeout) {
+      throw new RuntimeException("Functionality regarding running tests with javaagent on Gradle is not currently supported.");
+   }
+
+   /**
+    * Runs the given test and saves the results to the result folder.
+    * 
+    * @param specialResultFolder Folder for saving the results
+    * @param testname Name of the test that should be run
+    */
+    @Override
+    protected void runTest(String javaAgent, final File moduleFolder, final File methodLogFile, TestMethodCall test, final String testname, final long timeout) {
+       throw new RuntimeException("Functionality regarding running tests with javaagent on Gradle is not currently supported.");
+    }
+
    /**
     * Runs the given test and saves the results to the result folder.
     * 

dependency/src/main/java/de/dagere/peass/execution/maven/pom/MavenTestExecutor.java

@@ -131,22 +131,46 @@ public void executeTest(final TestMethodCall test, final File logFolder, final l
       cleanAboveSize(logFolder, "txt");
    }
 
+   @Override
+   public void executeTest(final String javaAgent, final TestMethodCall test, final File logFolder, final long timeout) {
+      final File moduleFolder = new File(folders.getProjectFolder(), test.getModule());
+      runMethod(logFolder, test, moduleFolder, timeout, javaAgent);
+
+      cleanAboveSize(logFolder, "txt");
+   }
+
    /**
     * Runs the given test and saves the results to the result folder.
     * 
     * @param specialResultFolder Folder for saving the results
     * @param testname Name of the test that should be run
     */
    @Override
-   protected void runTest(final File module, final File logFile, TestMethodCall test, final String testname, final long timeout) {
+   protected void runTest(final String javaAgent, final File module, final File logFile, TestMethodCall test, final String testname, final long timeout) {
       try {
-         final Process process = buildMavenProcess(logFile, test, "-Dtest=" + testname);
+         final Process process = buildMavenProcess(logFile, test, "-Dtest=" + testname, javaAgent);
          execute(testname, timeout, process);
       } catch (final InterruptedException | IOException e) {
          e.printStackTrace();
       }
    }
 
+   /**
+    * Runs the given test and saves the results to the result folder.
+    * 
+    * @param specialResultFolder Folder for saving the results
+    * @param testname Name of the test that should be run
+    */
+    @Override
+    protected void runTest(final File module, final File logFile, TestMethodCall test, final String testname, final long timeout) {
+       try {
+          final Process process = buildMavenProcess(logFile, test, "-Dtest=" + testname);
+          execute(testname, timeout, process);
+       } catch (final InterruptedException | IOException e) {
+          e.printStackTrace();
+       }
+    }
+
    @Override
    public boolean doesBuildfileExist() {
       File pomFile = new File(folders.getProjectFolder(), "pom.xml");

dependency/src/main/java/de/dagere/peass/execution/utils/KoPeMeExecutor.java

@@ -45,8 +45,14 @@ protected String getTestGoal() {
    }
 
    protected abstract void runTest(File moduleFolder, final File logFile, TestMethodCall test, final String testname, final long timeout);
+
+   protected abstract void runTest(String javaAgent, File moduleFolder, final File logFile, TestMethodCall test, final String testname, final long timeout);
 
    protected void runMethod(final File logFolder, final TestMethodCall test, final File moduleFolder, final long timeout) {
+      runMethod(logFolder, test, moduleFolder, timeout, null);
+   }
+
+   protected void runMethod(final File logFolder, final TestMethodCall test, final File moduleFolder, final long timeout, String javaAgent) {
       try (final JUnitTestShortener shortener = new JUnitTestShortener(testTransformer, moduleFolder, test.toEntity(), test.getMethod())) {
          if (testTransformer.getConfig().isDirectlyMeasureKieker()) {
             File fileToInstrument = shortener.getCalleeClazzFile();
@@ -68,7 +74,14 @@ protected void runMethod(final File logFolder, final TestMethodCall test, final
          clean(cleanFile);
 
          final File methodLogFile = getMethodLogFile(logFolder, test);
-         runTest(moduleFolder, methodLogFile, test, test.getClazz(), timeout);
+
+         if(javaAgent != null) {
+            runTest(javaAgent, moduleFolder, methodLogFile, test, test.getClazz(), timeout == 0 ? 300 : timeout);
+         } else {
+            runTest(moduleFolder, methodLogFile, test, test.getClazz(), timeout == 0 ? 300 : timeout);
+         }
+
+//         runTest(moduleFolder, methodLogFile, test, test.getClazz(), timeout);
       } catch (Exception e1) {
          e1.printStackTrace();
       }

dependency/src/main/java/de/dagere/peass/execution/utils/TestExecutor.java

@@ -64,6 +64,8 @@ public int getJDKVersion() {
 
    public abstract void executeTest(final TestMethodCall test, final File logFolder, long timeout);
 
+   public abstract void executeTest(final String javaAgent, final TestMethodCall test, final File logFolder, long timeout);
+
    /**
     * Deletes files which are bigger than sizeInMb Mb, since they pollute the disc space and will not be analyzable
     *
@@ -125,7 +127,7 @@ protected void prepareKiekerSource() {
 
    protected void execute(final String testname, final long timeoutInSeconds, final Process process) {
       if (timeoutInSeconds == -1) {
-         LOG.info("Executing without timeout!");
+         LOG.warn("Executing without timeout!");
          try {
             process.waitFor();
          } catch (InterruptedException e) {

dependency/src/main/java/de/dagere/peass/folders/PeassFolders.java

@@ -201,7 +201,7 @@ public List<File> findTempClazzFolder(final TestCase testcase) {
 
    private List<File> findTempClazzFolder(final File baseFolder, final FileFilter folderFilter) {
       final List<File> files = new LinkedList<>();
-      System.out.println("Searching in " + baseFolder + " " + baseFolder.exists());
+      LOG.trace("Searching in {} {}", baseFolder, baseFolder.exists());
       for (final File subfolder : baseFolder.listFiles()) {
          if (subfolder.isDirectory()) {
             if (folderFilter.accept(subfolder)) {

dependency/src/test/java/de/dagere/peass/dependency/DummyExecutor.java

@@ -52,4 +52,10 @@ public boolean doesBuildfileExist() {
       return true;
    }
 
+   @Override
+   public void executeTest(String javaAgent, TestMethodCall test, File logFolder, long timeout) {
+      // TODO Auto-generated method stub
+      throw new UnsupportedOperationException("Unimplemented method 'executeTest'");
+   }
+
 }

dependency/src/test/java/de/dagere/peass/dependency/TestExecutorCreatorSubclasses.java

@@ -74,6 +74,10 @@ public ProjectModules getModules() {
    @Override
    protected void clean(final File logFile) throws IOException, InterruptedException {
    }
+
+   @Override
+   public void executeTest(String javaAgent, TestMethodCall test, File logFolder, long timeout) {
+   }
 
 }
 

dependency/src/test/java/de/dagere/peass/dependencytests/DependencyDetectorIncludesTest.java

@@ -8,6 +8,7 @@
 import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import com.github.javaparser.ParseException;

measurement/pom.xml

@@ -61,6 +61,12 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>io.github.terahidro2003</groupId>
+      <artifactId>sjsw</artifactId>
+      <version>0.1.4-SNAPSHOT</version>
+    </dependency>
+
     <!-- For execution, it is assumed that the kieker aspectJ-jar is in the local .m2 directory; no need for inclusion in jar, therefore scope runtime -->
     <dependency>
       <groupId>net.kieker-monitoring</groupId>

measurement/src/main/java/de/dagere/peass/SearchCauseStarter.java

@@ -189,7 +189,9 @@ public TreeAnalyzer getAnalyzer(final BothTreeReader reader, final CauseSearcher
             tester = new CauseSearcherComplete(reader, causeSearcherConfig, measurer, measurementConfiguration, alternateFolders, creator, env);
             break;
          case SAMPLING:
-            tester = new SamplingCauseSearcher(causeSearcherConfig.getTestCase(), measurementConfiguration, alternateFolders, env);
+            measurementConfiguration.setUseKieker(false);
+            tester = new SamplingCauseSearcher(causeSearcherConfig.getTestCase(), measurementConfiguration, alternateFolders, env, causeSearcherConfig, reader);
+            break;
          default:
             throw new RuntimeException("Strategy " + causeSearcherConfig.getRcaStrategy() + " not expected");
          }

measurement/src/main/java/de/dagere/peass/measurement/dependencyprocessors/SamplingRunner.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.time.Duration;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
@@ -13,6 +14,12 @@
 import de.dagere.peass.measurement.organize.ResultOrganizer;
 import de.dagere.peass.measurement.rca.searcher.ICauseSearcher;
 import de.dagere.peass.testtransformation.TestTransformer;
+import io.github.terahidro2003.config.Config;
+import io.github.terahidro2003.samplers.SamplerExecutorPipeline;
+import io.github.terahidro2003.samplers.asyncprofiler.AsyncProfilerExecutor;
+import io.github.terahidro2003.samplers.asyncprofiler.MeasurementInformation;
+
+import static io.github.terahidro2003.samplers.asyncprofiler.AsyncProfilerExecutor.log;
 
 public class SamplingRunner extends AbstractMeasurementProcessRunner {
    private static final Logger LOG = LogManager.getLogger(OnceRunner.class);
@@ -23,13 +30,17 @@ public class SamplingRunner extends AbstractMeasurementProcessRunner {
    protected final ResultOrganizer currentOrganizer;
    private final ICauseSearcher resultHandler;
 
-   public SamplingRunner(final PeassFolders folders, final TestExecutor testExecutor, final ResultOrganizer currentOrganizer, final ICauseSearcher resultHandler) {
+   private final Config configuration;
+
+   public SamplingRunner(final PeassFolders folders, final TestExecutor testExecutor, final ResultOrganizer currentOrganizer, final ICauseSearcher resultHandler,
+         final Config config) {
       super(folders);
       this.testTransformer = testExecutor.getTestTransformer();
       this.testExecutor = testExecutor;
       this.currentOrganizer = currentOrganizer;
       this.resultHandler = resultHandler;
-
+      this.configuration = config;
+
       try {
          FileUtils.cleanDirectory(folders.getTempDir());
       } catch (IOException e) {
@@ -39,20 +50,32 @@ public SamplingRunner(final PeassFolders folders, final TestExecutor testExecuto
 
    @Override
    public void runOnce(TestMethodCall testcase, String commit, int vmid, File logFolder) {
+      LOG.debug("Preparing testcase {} to run with SAMPLING enabled", testcase);
       initCommit(commit);
 
-      final File vmidFolder = initVMFolder(commit, vmid, logFolder);
-
+      testExecutor.loadClasses();
       testExecutor.prepareKoPeMeExecution(new File(logFolder, "clean.txt"));
-
-      //TODO implement sampling measurement
-      if (true) {
-         throw new RuntimeException("Not implemented yet");
-      }
-
+
+      final File vmidFolder = initVMFolder(commit, vmid, logFolder);
+
+      // What is the reason behind this arithmetic of timeout?
+      final long outerTimeout = 10 + (int) (this.testTransformer.getConfig().getTimeoutInSeconds() * 1.2);
+      LOG.info("Executing testcase {}", testcase);
+      String mavenJavaAgent = retrieveProfilerJavaAgentAsMavenArgument(configuration, outerTimeout, vmid, logFolder, commit);
+      testExecutor.executeTest(mavenJavaAgent, testcase, vmidFolder, outerTimeout);
+
       LOG.info("Organizing result paths");
       currentOrganizer.saveResultFiles(commit, vmid);
 
       cleanup();
    }
+
+   private String retrieveProfilerJavaAgentAsMavenArgument(Config config, long maxSamplingDuration, int vmid, File logFolder, String commit) {
+      Duration duration = Duration.ofSeconds(maxSamplingDuration * 60);
+      SamplerExecutorPipeline pipeline = new AsyncProfilerExecutor();
+      MeasurementInformation agent = pipeline.javaAgent(this.configuration, vmid, commit, duration);
+      String javaAgentAsMavenArgument = "-DargLine=" + agent.javaAgentPath();
+      LOG.info("Async-profiler java-agent configured: {}", javaAgentAsMavenArgument);
+      return javaAgentAsMavenArgument;
+   }
 }

measurement/src/main/java/de/dagere/peass/measurement/rca/data/BasicNode.java

@@ -73,6 +73,8 @@ public String getCall() {
       return call;
    }
 
+   public void setCall(String call) { this.call = call; }
+
    public String getKiekerPattern() {
       return kiekerPattern;
    }

measurement/src/main/java/de/dagere/peass/measurement/rca/data/CallTreeNode.java

@@ -51,6 +51,14 @@ public class CallTreeNode extends BasicNode {
    protected final List<CallTreeNode> children = new ArrayList<>();
    protected final Map<String, CallTreeStatistics> data = new HashMap<>();
 
+   public List<String> getKeys() {
+      return data.keySet().stream().collect(Collectors.toList());
+   }
+
+   public Map<String, CallTreeStatistics> getData() {
+      return data;
+   }
+
    @JsonIgnore
    protected MeasurementConfig config;
 
@@ -184,14 +192,23 @@ public String toString() {
       return kiekerPattern.toString();
    }
 
+   private String extractMethodName(String call) {
+      int lastParenthesisIndex = call.contains("(") ? call.lastIndexOf("(") : call.length() -1;
+      String methodName = call.substring(0, lastParenthesisIndex);
+
+      String[] parts = methodName.split(" ");
+      return parts.length > 1 ? parts[parts.length - 1] : call;
+   }
+
    public MethodCall toEntity() {
       if (call.equals(CauseSearchData.ADDED)) {
-         String otherKiekerPattern = getOtherKiekerPattern();
-         String otherCall = otherKiekerPattern.substring(otherKiekerPattern.lastIndexOf(' '), otherKiekerPattern.indexOf('('));
+//         String otherKiekerPattern = getOtherKiekerPattern();
+         String otherCall = getOtherCommitNode().getCall();
          return MethodCall.createMethodCallFromString(otherCall);
       } else {
          final int index = call.lastIndexOf(MethodCall.METHOD_SEPARATOR);
          String method = call.substring(index + 1);
+         System.out.println(call + " " + method);
          final MethodCall entity;
          if (method.contains("(")) {
             entity = new MethodCall(call.substring(0, index), module, method.substring(0, method.indexOf('(')));
@@ -287,7 +304,7 @@ public void setOtherCommitNode(final CallTreeNode otherVersionNode) {
 
    @JsonIgnore
    public String getMethod() {
-      final String method = call.substring(call.lastIndexOf('#'));
+      final String method = call.contains("#") ? call.substring(call.lastIndexOf('#')) : call;
       return method;
    }
 

measurement/src/main/java/de/dagere/peass/measurement/rca/data/CauseSearchData.java

@@ -98,7 +98,12 @@ private void setStatistic(final CallTreeNode rawDataNode, final MeasuredNode ser
          serializeNode.setStatistic(rawDataNode.getTestcaseStatistic());
       } else {
          LOG.debug(rawDataNode.getCall() + " " + rawDataNode.getOtherKiekerPattern());
-         serializeNode.setStatistic(rawDataNode.getPartialTestcaseStatistic());
+         if (rawDataNode.getCall().equals(ADDED) &&
+                 !rawDataNode.getOtherKiekerPattern().equals(ADDED)) {
+            serializeNode.setStatistic(rawDataNode.getOtherCommitNode().getPartialTestcaseStatistic());
+         } else {
+            serializeNode.setStatistic(rawDataNode.getPartialTestcaseStatistic());
+         }
       }
    }