Merge pull request #8 from softvis-research/development

rmllr · web-flow · commit 3cf9d8b1ef76 · 2020-08-31T15:53:42.000+02:00
merge development into master
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallsDescriptor.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallsDescriptor.java
@@ -11,5 +11,4 @@ public interface CallsDescriptor extends Descriptor, WeightDescriptor {
 
     @Relation.Incoming
     MethodDescriptor getCaller();
-
 }
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/RecordDescriptor.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/RecordDescriptor.java
@@ -15,7 +15,7 @@
 public interface RecordDescriptor extends KiekerDescriptor, DirectoryDescriptor {
 
     @Relation("CONTAINS")
-    List<TraceDescriptor> getTraces();
+    List<MethodDescriptor> getMethods();
 
     @Relation("CONTAINS")
     List<MeasurementDescriptor> getMeasurements();
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/TraceDescriptor.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/TraceDescriptor.java
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerDirectoryScannerPlugin.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerDirectoryScannerPlugin.java
@@ -50,13 +50,17 @@ protected RecordDescriptor getContainerDescriptor(File container, ScannerContext
         final RecordDescriptor recordDescriptor = scannerContext.getStore().addDescriptorType(directoryDescriptor, RecordDescriptor.class);
 
         // Set record receiver that maps read records to corresponding descriptors
-        KiekerRecordReceiver kiekerRecordReceiver = new KiekerRecordReceiver(new KiekerHelper(scannerContext, recordDescriptor));
+        KiekerHelper kiekerHelper = new KiekerHelper(scannerContext, recordDescriptor);
+        KiekerRecordReceiver kiekerRecordReceiver = new KiekerRecordReceiver(kiekerHelper);
 
         // Set filesystem directory reader (reads *.map, *.dat, *.bin, *.xz files in a directory)
         // Todo use another reader
         FSDirectoryReader fsDirectoryReader = new FSDirectoryReader(container, kiekerRecordReceiver, true);
         fsDirectoryReader.run();
 
+        // add all methods to record
+        kiekerHelper.addMethodsToRecord();
+
         return recordDescriptor;
     }
 
@@ -70,7 +74,6 @@ protected RecordDescriptor getContainerDescriptor(File container, ScannerContext
      */
     @Override
     protected void enterContainer(File container, RecordDescriptor containerDescriptor, ScannerContext scannerContext) throws IOException {
-
     }
 
     /**
@@ -82,6 +85,5 @@ protected void enterContainer(File container, RecordDescriptor containerDescript
      */
     @Override
     protected void leaveContainer(File container, RecordDescriptor containerDescriptor, ScannerContext scannerContext) throws IOException {
-
     }
 }
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerHelper.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerHelper.java
@@ -4,7 +4,6 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import kieker.common.record.IMonitoringRecord;
-import kieker.common.record.flow.trace.TraceMetadata;
 import kieker.common.record.flow.trace.operation.AbstractOperationEvent;
 import kieker.common.record.flow.trace.operation.AfterOperationEvent;
 import kieker.common.record.flow.trace.operation.BeforeOperationEvent;
@@ -36,7 +35,6 @@ public class KiekerHelper {
     private RecordDescriptor recordDescriptor;
     private Cache<MethodDescriptorKey, MethodDescriptor> methodDescriptorCache;
     private Cache<CallsDescriptorKey, CallsDescriptor> callsDescriptorCache;
-    private Map<Long, TraceDescriptor> traceCache;
     private Map<String, Stack<BeforeOperationEvent>> timestampCache;
     private final String REGEX_FOR_METHOD_NAME = "([a-zA-Z0-9_]+) *\\(";
 
@@ -45,7 +43,6 @@ public KiekerHelper(ScannerContext scannerContext, RecordDescriptor recordDescri
         this.recordDescriptor = recordDescriptor;
         this.methodDescriptorCache = Caffeine.newBuilder().maximumSize(100000).build();
         this.callsDescriptorCache = Caffeine.newBuilder().maximumSize(10000000).build();
-        this.traceCache = new HashMap<>();
         this.timestampCache = new HashMap<>();
     }
 
@@ -60,17 +57,6 @@ void createRecord(KiekerMetadataRecord record) {
         recordDescriptor.setNumberOfRecords(record.getNumberOfRecords());
     }
 
-    void createTrace(TraceMetadata trace) {
-        TraceDescriptor traceDescriptor = scannerContext.getStore().create(TraceDescriptor.class);
-        traceDescriptor.setLoggingTimestamp(trace.getLoggingTimestamp());
-        traceDescriptor.setTraceId(trace.getTraceId());
-        traceDescriptor.setThreadId(trace.getThreadId());
-        traceDescriptor.setSessionId(trace.getSessionId());
-        traceDescriptor.setHostname(trace.getHostname());
-        recordDescriptor.getTraces().add(traceDescriptor);
-        traceCache.put(trace.getTraceId(), traceDescriptor);
-    }
-
     void createEvent(AbstractOperationEvent event) {
         if (event instanceof BeforeOperationEvent || event instanceof AfterOperationEvent) {
             if (event instanceof BeforeOperationEvent) {
@@ -83,10 +69,6 @@ void createEvent(AbstractOperationEvent event) {
                 BeforeOperationEvent beforeOperationEvent = popFromTimestampStack(methodDescriptor.getSignature());
                 if (beforeOperationEvent != null) {
                     methodDescriptor.setDuration(methodDescriptor.getDuration() + (event.getTimestamp() - beforeOperationEvent.getTimestamp()));
-                    // add method to trace if not already done
-                    if (!getTraceDescriptor(event).getMethods().contains(methodDescriptor)) {
-                        getTraceDescriptor(event).getMethods().add(methodDescriptor);
-                    }
                 } else {
                     LOGGER.warn("BeforeOperationEvent for method " + methodDescriptor.getSignature() + " missing.");
                 }
@@ -96,12 +78,14 @@ void createEvent(AbstractOperationEvent event) {
             CallOperationEvent callOperationEvent = (CallOperationEvent) event;
             MethodDescriptor caller = getMethodDescriptor(callOperationEvent.getCallerClassSignature(), callOperationEvent.getCallerOperationSignature());
             MethodDescriptor callee = getMethodDescriptor(callOperationEvent.getCalleeClassSignature(), callOperationEvent.getCalleeOperationSignature());
+            // update number of incoming and outgoing calls
+            if (callOperationEvent.getOrderIndex() == 1) {
+                caller.setIncomingCalls(caller.getIncomingCalls() + 1);
+            }
+            caller.setOutgoingCalls(caller.getOutgoingCalls() + 1);
+            callee.setIncomingCalls(callee.getIncomingCalls() + 1);
             // add call
             addCall(caller, callee);
-            // add caller to trace if not already done
-            if (!getTraceDescriptor(event).getMethods().contains(caller)) {
-                getTraceDescriptor(event).getMethods().add(caller);
-            }
         }
     }
 
@@ -127,27 +111,19 @@ private synchronized BeforeOperationEvent popFromTimestampStack(String signature
         }
     }
 
-    private TraceDescriptor getTraceDescriptor(AbstractOperationEvent event) {
-        TraceDescriptor traceDescriptor;
-        if (traceCache.containsKey(event.getTraceId())) {
-            traceDescriptor = traceCache.get(event.getTraceId());
-        } else {
-            traceDescriptor = scannerContext.getStore().create(TraceDescriptor.class);
-            traceDescriptor.setTraceId(event.getTraceId());
-            recordDescriptor.getTraces().add(traceDescriptor);
-            traceCache.put(event.getTraceId(), traceDescriptor);
-        }
-        return traceDescriptor;
-    }
-
     private MethodDescriptor getMethodDescriptor(String fqn, String signature) {
         return methodDescriptorCache.get(MethodDescriptorKey.builder().type(fqn).signature(signature).build(), methodDescriptorKey -> {
             Map<String, Object> params = new HashMap<>();
             params.put("fqn", fqn);
             params.put("typeName", fqn.substring(fqn.lastIndexOf(".") + 1));
             params.put("signature", signature);
-            params.put("methodName", getMethodNameFromSignature(signature));
-            return scannerContext.getStore().executeQuery("MERGE (t:Kieker:Type{fqn:$fqn}) ON CREATE SET t.name=$typeName MERGE (t)-[:DECLARES]->(m:Kieker:Method{signature:$signature,name:$methodName}) RETURN m", params).getSingleResult().get("m", MethodDescriptor.class);
+            // exclude encoded signature as no method name can be created
+            if (signature.endsWith(")")) {
+                params.put("methodName", getMethodNameFromSignature(signature));
+                return scannerContext.getStore().executeQuery("MERGE (t:Kieker:Type{fqn:$fqn}) ON CREATE SET t.name=$typeName MERGE (t)-[:DECLARES]->(m:Kieker:Method{signature:$signature,name:$methodName}) RETURN m", params).getSingleResult().get("m", MethodDescriptor.class);
+            } else {
+                return scannerContext.getStore().executeQuery("MERGE (t:Kieker:Type{fqn:$fqn}) ON CREATE SET t.name=$typeName MERGE (t)-[:DECLARES]->(m:Kieker:Method{signature:$signature}) RETURN m", params).getSingleResult().get("m", MethodDescriptor.class);
+            }
         });
     }
 
@@ -276,4 +252,8 @@ private static class CallsDescriptorKey {
         private MethodDescriptor callee;
 
     }
+
+    public void addMethodsToRecord() {
+        recordDescriptor.getMethods().addAll(methodDescriptorCache.asMap().values());
+    }
 }
diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerRecordReceiver.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/impl/scanner/KiekerRecordReceiver.java
@@ -2,7 +2,6 @@
 
 import kieker.analysis.plugin.reader.util.IMonitoringRecordReceiver;
 import kieker.common.record.IMonitoringRecord;
-import kieker.common.record.flow.trace.TraceMetadata;
 import kieker.common.record.flow.trace.operation.AbstractOperationEvent;
 import kieker.common.record.misc.KiekerMetadataRecord;
 import kieker.common.record.system.*;
@@ -34,8 +33,6 @@ public KiekerRecordReceiver(KiekerHelper kiekerHelper) {
     public boolean newMonitoringRecord(IMonitoringRecord iMonitoringRecord) {
         if (iMonitoringRecord instanceof KiekerMetadataRecord) {
             kiekerHelper.createRecord((KiekerMetadataRecord) iMonitoringRecord);
-        } else if (iMonitoringRecord instanceof TraceMetadata) {
-            kiekerHelper.createTrace((TraceMetadata) iMonitoringRecord);
         } else if (iMonitoringRecord instanceof AbstractOperationEvent) {
             kiekerHelper.createEvent((AbstractOperationEvent) iMonitoringRecord);
         } else if (iMonitoringRecord instanceof CPUUtilizationRecord || iMonitoringRecord instanceof DiskUsageRecord ||
diff --git a/src/main/resources/META-INF/jqassistant-plugin.xml b/src/main/resources/META-INF/jqassistant-plugin.xml
@@ -3,7 +3,6 @@
     <description>Provides a scanner for Kieker files.</description>
     <model>
         <class>org.jqassistant.contrib.plugin.kieker.api.model.MethodDescriptor</class>
-        <class>org.jqassistant.contrib.plugin.kieker.api.model.TraceDescriptor</class>
         <class>org.jqassistant.contrib.plugin.kieker.api.model.TypeDescriptor</class>
         <class>org.jqassistant.contrib.plugin.kieker.api.model.RecordDescriptor</class>
         <class>org.jqassistant.contrib.plugin.kieker.api.model.CallsDescriptor</class>
diff --git a/src/test/java/org/jqassistant/contrib/plugin/kieker/test/MethodIT.java b/src/test/java/org/jqassistant/contrib/plugin/kieker/test/MethodIT.java
@@ -29,8 +29,6 @@ public void testMethod() {
         // kieker.examples.monitoring.aspectj.Bookstore.searchBook()"
         assertThat(testResultProperties.getColumn("m.signature").get(0).toString(),
             equalTo("public void kieker.examples.monitoring.aspectj.Bookstore.searchBook()"));
-        // two events have this function -> 1 After- plus 1 BeforeOperationEvent
-        assertThat(testResultProperties.getColumn("m.signature").size(), equalTo(1));
         store.commitTransaction();
     }
 }
diff --git a/src/test/java/org/jqassistant/contrib/plugin/kieker/test/RecordIT.java b/src/test/java/org/jqassistant/contrib/plugin/kieker/test/RecordIT.java
@@ -17,9 +17,6 @@ public void testRecord() {
         File directory = new File(TEST_DIRECTORY_PATH);
         store.beginTransaction();
         getScanner().scan(directory, TEST_DIRECTORY_PATH, DefaultScope.NONE);
-        TestResult testResult = query("MATCH (:Record)-[:CONTAINS]->(t:Trace) RETURN t");
-        // one record with two traces
-        assertThat(testResult.getColumn("t").size(), equalTo(2));
 
         // test property values
         TestResult testResultProperties = query(
diff --git a/src/test/java/org/jqassistant/contrib/plugin/kieker/test/TraceIT.java b/src/test/java/org/jqassistant/contrib/plugin/kieker/test/TraceIT.java

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ public interface CallsDescriptor extends Descriptor, WeightDescriptor {`
`11`	`11`
`12`	`12`	`@Relation.Incoming`
`13`	`13`	`MethodDescriptor getCaller();`
`14`		`-`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ public void testMethod() {`
`29`	`29`	`// kieker.examples.monitoring.aspectj.Bookstore.searchBook()"`
`30`	`30`	`assertThat(testResultProperties.getColumn("m.signature").get(0).toString(),`
`31`	`31`	`equalTo("public void kieker.examples.monitoring.aspectj.Bookstore.searchBook()"));`
`32`		`- // two events have this function -> 1 After- plus 1 BeforeOperationEvent`
`33`		`- assertThat(testResultProperties.getColumn("m.signature").size(), equalTo(1));`
`34`	`32`	`store.commitTransaction();`
`35`	`33`	`}`
`36`	`34`	`}`