From 502e4527e68b1b6a9c17a422f46ce0eb2bed3edd Mon Sep 17 00:00:00 2001
From: Matthias <m.blohm@etermio.com>
Date: Mon, 19 Dec 2016 18:43:18 +0100
Subject: [PATCH] Hostname now optional
---
.../JPetStore/JPetStore.properties | 3 +--
.../descartes/dql/connector/kieker/KiekerManager.java | 10 ++++++----
.../kieker/filter/KiekerAnalysisController.java | 6 ++++--
.../dql/connector/kieker/structures/Trace.java | 9 ++++++++-
4 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/tools.descartes.dql.connector.kieker.examples/JPetStore/JPetStore.properties b/tools.descartes.dql.connector.kieker.examples/JPetStore/JPetStore.properties
index 13f37c5..63b86ab 100644
--- a/tools.descartes.dql.connector.kieker.examples/JPetStore/JPetStore.properties
+++ b/tools.descartes.dql.connector.kieker.examples/JPetStore/JPetStore.properties
@@ -1,2 +1 @@
-kieker.log.directory=traceFiles
-kieker.log.hostname=KIEKER-DEMO-SRV
\ No newline at end of file
+kieker.log.directory=traceFiles
\ No newline at end of file
diff --git a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/KiekerManager.java b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/KiekerManager.java
index 4c2f787..25952d1 100644
--- a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/KiekerManager.java
+++ b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/KiekerManager.java
@@ -90,8 +90,10 @@ public class KiekerManager {
}
}
this.traceFileHostName= (String) prop.get(KiekerHelper.KIEKER_LOG_HOSTNAME);
- if (this.traceFileHostName == ""){
- this.traceFileHostName = KiekerHelper.getHostName();
+ if (this.traceFileHostName == null){
+ // no special hostname for filtering, accept all
+ this.traceFileHostName = "";
+ //this.traceFileHostName = KiekerHelper.getHostName();
}
log("TraceFiles found under "+traceFileOutputPath);
startAnalysis();
@@ -191,8 +193,8 @@ public class KiekerManager {
log("Starting analysis...");
try{
Configuration analysisConfiguration = KiekerHelper.createAnalysisConfig(request, traceFileOutputPath,traceFileHostName);
-
- KiekerAnalysisController c = new KiekerAnalysisController(analysisConfiguration);
+ boolean ignoreHost = this.traceFileHostName.equals("");
+ KiekerAnalysisController c = new KiekerAnalysisController(analysisConfiguration,ignoreHost);
c.fillTrace();
this.analysisResult = c.getTrace();
this.analysisResult.sortChronological();
diff --git a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/filter/KiekerAnalysisController.java b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/filter/KiekerAnalysisController.java
index 801012b..4a05548 100644
--- a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/filter/KiekerAnalysisController.java
+++ b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/filter/KiekerAnalysisController.java
@@ -12,9 +12,11 @@ public class KiekerAnalysisController {
private final Configuration config;
public static final String CONFIG_LOG4J_FILE_PATH = "LOG4J_FILE_PATH";
private Trace trace;
+ private boolean ignoreHost = false;
- public KiekerAnalysisController(Configuration config) {
+ public KiekerAnalysisController(Configuration config, boolean ignoreHost) {
this.config=config;
+ this.ignoreHost = ignoreHost;
}
public KiekerAnalysisController(String configFilePath) {
@@ -73,7 +75,7 @@ public class KiekerAnalysisController {
t = new KiekerTraceLoader(t)
.loadKiekerTraceFromDirectories(traceDirectories.toArray(new String[traceDirectories.size()]));
- this.trace = t.initializeMaps();
+ this.trace = t.initializeMaps(ignoreHost);
}
diff --git a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/structures/Trace.java b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/structures/Trace.java
index 3312a29..c7b4048 100644
--- a/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/structures/Trace.java
+++ b/tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/structures/Trace.java
@@ -35,6 +35,7 @@ public class Trace {
}
}
+
//preset identifiers connected to Components/Resources (Components/Resources initialized via name only)
private Map<ComponentIdentifier, Component> componentIdentifierToComponentMap; //must be preset
private Map<ResourceIdentifier, Resource> resourceIdentifierToResourceMap; //must be preset
@@ -103,16 +104,22 @@ public class Trace {
resources.add(event);
}
- public Trace initializeMaps() {
+ public Trace initializeMaps(boolean ignoreHost) {
idToRequestMap = new HashMap<String, Request>();
componentToTraceMap = new HashMap<Component, Trace>();
resourceToTraceMap = new HashMap<Resource, Trace>();
for (EventRecord event : events) {
+ if (ignoreHost){
+ event.getIdentifier().setHostID("");
+ }
if (addToComponentMap(event)) {
addToRequestMap(event);
}
}
for (ResourceRecord resource : resources) {
+ if (ignoreHost){
+ resource.getIdentifier().setHostID("");
+ }
addToResourceMap(resource);
}
return this;
--
GitLab