Skip to content
Snippets Groups Projects
Commit 097e2cc5 authored by Christian Zirkelbach's avatar Christian Zirkelbach
Browse files

Fixed export of metadatarecord

parent 3586b4dc
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/explorviz/live_trace_processing/external/Main.java
+ 34
− 34
View file @ 097e2cc5
package explorviz.live_trace_processing.external;
import java.util.LinkedList;
import explorviz.live_trace_processing.external.generic.AbstractImporter;
import explorviz.live_trace_processing.external.kieker.KiekerImporter;
import explorviz.live_trace_processing.main.MonitoringController;
public class Main {
// private static String inputFolder = "examples/kieker/java/Cocome";
// private static String appName = "iObserve";
private static String inputFolder = "examples/kieker/java/CoCoME";
private static String appName = "CoCoME";
public static void main(final String[] args) {
// if (args.length > 1) {
......@@ -16,37 +14,39 @@ public class Main {
// appName = args[1];
// }
// final AbstractImporter currentImporter = new KiekerImporter();
// currentImporter.importLogs(inputFolder, appName);
// Modified importer for iObserve study
// Importing adapter -> enterprise -> registry -> store -> webfrontend
final String baseInputFolder = "examples/kieker/java/iObserve/";
final String systemName = "CoCoME";
final String programmingLanguage = "Java";
// sub folder with coressponding application names
final LinkedList<String> applicationList = new LinkedList<String>();
applicationList.add("adapter");
applicationList.add("enterprise");
applicationList.add("store");
applicationList.add("registry");
applicationList.add("webfrontend");
// related ip addresses in same order
final LinkedList<String> ipaddressList = new LinkedList<String>();
ipaddressList.add("192.168.0.6");
ipaddressList.add("192.168.0.5");
ipaddressList.add("192.168.0.4");
ipaddressList.add("192.168.0.3");
ipaddressList.add("192.168.0.2");
final AbstractImporter currentImporter = new KiekerImporter();
for (int i = 4; i < applicationList.size(); i++) {
currentImporter.importLogs(baseInputFolder + applicationList.get(i), applicationList.get(i), systemName,
ipaddressList.get(i), programmingLanguage);
}
currentImporter.importLogs(inputFolder, appName, "CoCoME", "127.0.0.1", "Java");
// // Modified importer for iObserve study
// // Importing adapter -> enterprise -> registry -> store ->
// webfrontend
// final String baseInputFolder = "examples/kieker/java/iObserve/";
// final String systemName = "CoCoME";
// final String programmingLanguage = "Java";
//
// // sub folder with coressponding application names
// final LinkedList<String> applicationList = new LinkedList<String>();
// applicationList.add("adapter");
// applicationList.add("enterprise");
// applicationList.add("store");
// applicationList.add("registry");
// applicationList.add("webfrontend");
//
// // related ip addresses in same order
// final LinkedList<String> ipaddressList = new LinkedList<String>();
// ipaddressList.add("192.168.0.6");
// ipaddressList.add("192.168.0.5");
// ipaddressList.add("192.168.0.4");
// ipaddressList.add("192.168.0.3");
// ipaddressList.add("192.168.0.2");
//
// final AbstractImporter currentImporter = new KiekerImporter();
//
// for (int i = 4; i < applicationList.size(); i++) {
// currentImporter.importLogs(baseInputFolder + applicationList.get(i),
// applicationList.get(i), systemName,
// ipaddressList.get(i), programmingLanguage);
// }
MonitoringController.shutdown();
}
......
src/explorviz/live_trace_processing/external/generic/GenericExplorVizExternalLogAdapter.java
+ 2
− 7
View file @ 097e2cc5
......@@ -140,10 +140,9 @@ public class GenericExplorVizExternalLogAdapter {
orderIndex, cause);
}
// czi 23.03.2017 - extension towards MetaDataRecord
// czi 29.03.2017 - extension towards MetaDataRecord
public static void sendHostApplicationMetaDataRecord(final long timestamp, final String systemname,
final String ipaddress, final String hostname, final String application, final String programmingLanguage,
final String implementedInterface) {
final String ipaddress, final String hostname, final String application, final String programmingLanguage) {
explorVizBuffer.put(HostApplicationMetaDataRecord.CLAZZ_ID);
explorVizBuffer.putInt(MonitoringStringRegistry.getIdForString(systemname));
......@@ -152,10 +151,6 @@ public class GenericExplorVizExternalLogAdapter {
explorVizBuffer.putInt(MonitoringStringRegistry.getIdForString(application));
explorVizBuffer.putInt(MonitoringStringRegistry.getIdForString(programmingLanguage));
if (implementedInterface != null) {
explorVizBuffer.putInt(MonitoringStringRegistry.getIdForString(implementedInterface));
}
sendBufferIfHasElements(timestamp);
};
......
src/explorviz/live_trace_processing/external/kieker/KiekerToExplorVizTransformFilter.java
+ 9
− 10
View file @ 097e2cc5
......@@ -61,30 +61,28 @@ public class KiekerToExplorVizTransformFilter extends AbstractFilterPlugin {
final String hostName = kiekerMetaDataRecord.getHostname();
String systemName = "";
String application = hostName;
String ipaddress = "";
String programmingLanguage = "";
String ipaddress = "127.0.0.1";
String programmingLanguage = "Java";
// if KiekerMetaDataRecord is configured for importing logs
if (systemName != null) {
// Override configuration for importing logs as specified in Main.java
if (this.systemName != null) {
systemName = this.systemName;
}
if (application != null) {
if (applicationName != null) {
application = applicationName;
}
if (ipaddress != null) {
if (this.ipaddress != null) {
ipaddress = this.ipaddress;
}
if (programmingLanguage != null) {
if (this.programmingLanguage != null) {
programmingLanguage = this.programmingLanguage;
}
final String interfaceImpl = getInterface(kiekerMetaDataRecord);
GenericExplorVizExternalLogAdapter.sendHostApplicationMetaDataRecord(timestamp, systemName, ipaddress, hostName,
application, programmingLanguage, interfaceImpl);
application, programmingLanguage);
System.out.println("Found KiekerMetaDataRecord: " + kiekerMetaDataRecord);
}
......@@ -150,6 +148,7 @@ public class KiekerToExplorVizTransformFilter extends AbstractFilterPlugin {
GenericExplorVizExternalLogAdapter.sendBeforeRecord(kiekerBefore.getLoggingTimestamp(),
kiekerBefore.getTraceId(), kiekerBefore.getOrderIndex(), objectId,
convertSignatureToExplorViz(kiekerBefore), kiekerBefore.getClassSignature(), interfaceImpl);
} else if (kiekerRecord instanceof AfterOperationFailedEvent) {
final AfterOperationFailedEvent kiekerAfter = (AfterOperationFailedEvent) kiekerRecord;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment