From 2fba6d761655fe816707d7d385fa8232cb8c4e4a Mon Sep 17 00:00:00 2001
From: Juozas Skarbalius <juozas2003@gmail.com>
Date: Wed, 5 Feb 2025 09:55:22 +0200
Subject: [PATCH] Update SJSW version

---
 measurement/pom.xml                           |  2 +-
 .../rca/searcher/SamplingCauseSearcher.java   | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/measurement/pom.xml b/measurement/pom.xml
index 17ac5ea85..9361cb870 100644
--- a/measurement/pom.xml
+++ b/measurement/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.github.terahidro2003</groupId>
       <artifactId>sjsw</artifactId>
-      <version>0.1.3-SNAPSHOT</version>
+      <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 -->
diff --git a/measurement/src/main/java/de/dagere/peass/measurement/rca/searcher/SamplingCauseSearcher.java b/measurement/src/main/java/de/dagere/peass/measurement/rca/searcher/SamplingCauseSearcher.java
index 2e20a3101..3851a295a 100644
--- a/measurement/src/main/java/de/dagere/peass/measurement/rca/searcher/SamplingCauseSearcher.java
+++ b/measurement/src/main/java/de/dagere/peass/measurement/rca/searcher/SamplingCauseSearcher.java
@@ -18,6 +18,7 @@
 import de.dagere.peass.measurement.rca.treeanalysis.AllDifferingDeterminer;
 import de.dagere.peass.measurement.utils.sjsw.SjswCctConverter;
 import de.dagere.peass.vcs.GitUtils;
+import io.github.terahidro2003.result.tree.StackTraceTreeBuilder;
 import io.github.terahidro2003.result.tree.StackTraceTreeNode;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -151,9 +152,13 @@ public static void printCallTreeNode(CallTreeNode root) {
    }
 
    public static void printCallTreeNodeTreeRecursive(CallTreeNode node, String prefix, boolean isLast) {
-      if (node.getMethod() != null) {
-         System.out.println(prefix + (isLast ? "└────── " : "├────── ") + node.getMethod() +
-                 " Keys: [" + node.getKeys());
+      List<String> measurements = new LinkedList<>();
+      node.getData().forEach((commit, value) -> {
+         measurements.add(commit + "---" + value.getResults().size());
+      });
+      if (node.getCall() != null) {
+         System.out.println(prefix + (isLast ? "└────── " : "├────── ") + node.getCall() +
+                 " Measurements: " + measurements);
       }
 
       List<CallTreeNode> children = node.getChildren();
@@ -243,11 +248,15 @@ private List<CallTreeNode> getAnalysableNodes(final List<CallTreeNode> predecess
 
    private StackTraceTreeNode retrieveBatForCommit(String commit, SamplerResultsProcessor processor, Path resultsPath) {
       List<File> commitJfrs = processor.listJfrMeasurementFiles(resultsPath, List.of(commit));
-      StackTraceTreeNode tree = processor.getTreeFromJfr(commitJfrs, commit);
-      String normalizedMethodName = testcase.getMethod().substring(testcase.getMethod().lastIndexOf('#') + 1);
-      StackTraceTreeNode filteredTestcaseTree = processor.filterTestcaseSubtree(normalizedMethodName, tree);
-      filteredTestcaseTree.printTree();
-      return filteredTestcaseTree;
+      String normalizedMethodName = testcase.getMethodWithParams().substring(testcase.getMethod().lastIndexOf('#') + 1);
+
+      StackTraceTreeBuilder builder = new StackTraceTreeBuilder();
+      StackTraceTreeNode mergedTree = builder.buildTree(commitJfrs, commit, configuration.getVms(), normalizedMethodName, true);
+
+      System.out.println();
+      mergedTree.printTree();
+      System.out.println();
+      return mergedTree;
    }
 
    private File retrieveSamplingResultsDirectory(MeasurementIdentifier identifier) {