diff --git a/.classpath b/.classpath
index 578cc5c454a7cdd761ed273246aa961539db47ff..b8b1a6e031446734fc6393565429136c03a4af3d 100644
--- a/.classpath
+++ b/.classpath
@@ -2,9 +2,8 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.xtend.XTEND_CONTAINER"/>
<classpathentry kind="src" path="xtend-gen"/>
- <classpathentry excluding="kieker/analysis/plugin/reader/mq/" kind="src" path="src"/>
+ <classpathentry excluding="kieker/analysis/plugin/reader/mq/|explorviz/hpc_monitoring/connector/" kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/rabbitmq-client.jar"/>
<classpathentry kind="lib" path="lib/kieker-1.8-SNAPSHOT.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/monitored-application"/>
<classpathentry kind="output" path="bin"/>
diff --git a/lib/commons-cli-1.1.jar b/lib/commons-cli-1.1.jar
deleted file mode 100644
index e633afbe6842aa92b1a8f0ff3f5b8c0e3283961b..0000000000000000000000000000000000000000
Binary files a/lib/commons-cli-1.1.jar and /dev/null differ
diff --git a/lib/commons-io-1.2.jar b/lib/commons-io-1.2.jar
deleted file mode 100644
index b2867cdde4284228f2adc51e8a0358972bccaaf1..0000000000000000000000000000000000000000
Binary files a/lib/commons-io-1.2.jar and /dev/null differ
diff --git a/lib/junit.jar b/lib/junit.jar
deleted file mode 100644
index 674d71e89ea154dbe2e3cd032821c22b39e8fd68..0000000000000000000000000000000000000000
Binary files a/lib/junit.jar and /dev/null differ
diff --git a/lib/kieker-1.8-SNAPSHOT.jar b/lib/kieker-1.8-SNAPSHOT.jar
index 81509a16d0eef4a09917e5bd724a21677dd5c516..df64b2c0cfed9ef47bb88812ec85743a9f163a5a 100644
Binary files a/lib/kieker-1.8-SNAPSHOT.jar and b/lib/kieker-1.8-SNAPSHOT.jar differ
diff --git a/lib/rabbitmq-client.jar b/lib/rabbitmq-client.jar
deleted file mode 100644
index 548a994cca4d17c719c480a289139411816a8d98..0000000000000000000000000000000000000000
Binary files a/lib/rabbitmq-client.jar and /dev/null differ
diff --git a/src/explorviz/hpc_monitoring/reader/TCPReader.java b/src/explorviz/hpc_monitoring/reader/TCPReader.java
index 7848fb4da35b6d092b507e30afd3afb280b1374e..d5604815052962f91eac5eb77f7e9e4b857052b0 100644
--- a/src/explorviz/hpc_monitoring/reader/TCPReader.java
+++ b/src/explorviz/hpc_monitoring/reader/TCPReader.java
@@ -44,7 +44,7 @@ import explorviz.hpc_monitoring.record.events.*;
*/
@Plugin(description = "A reader which reads records from a RabbitMQ queue", dependencies = "This plugin needs the file 'rabbitmq.client-*.jar'.", outputPorts = { @OutputPort(name = TCPReader.OUTPUT_PORT_NAME_RECORDS, eventTypes = { Object.class }, description = "Output Port of the JMSReader") }, configuration = {
@Property(name = TCPReader.CONFIG_PROPERTY_NAME_PROVIDERURL, defaultValue = "localhost"),
- @Property(name = TCPReader.CONFIG_PROPERTY_PORT, defaultValue = "9876")
+ @Property(name = TCPReader.CONFIG_PROPERTY_PORT, defaultValue = "10133")
})
public final class TCPReader extends AbstractReaderPlugin {
@@ -57,7 +57,7 @@ public final class TCPReader extends AbstractReaderPlugin {
/** The name of the configuration determining the RabbitMQ provider URL. */
public static final String CONFIG_PROPERTY_NAME_PROVIDERURL = "mqProviderUrl";
/** The port that is used to connect to a queue. */
- public static final String CONFIG_PROPERTY_PORT = "9876";
+ public static final String CONFIG_PROPERTY_PORT = "10133";
static final Log LOG = LogFactory
.getLog(TCPReader.class); // NOPMD
@@ -376,7 +376,6 @@ public final class TCPReader extends AbstractReaderPlugin {
public void addToRegistry(Integer key, String value) {
stringRegistry.put(key, value);
- System.out.println(key + " " + value);
synchronized (this) {
notifyAll();
diff --git a/src/explorviz/hpc_monitoring/record/Trace.java b/src/explorviz/hpc_monitoring/record/Trace.java
index f70a3b65f3c750a3118328bd8bdd40434ced3140..292dceaf27dd48743160a3e4710e177d7ce44afb 100644
--- a/src/explorviz/hpc_monitoring/record/Trace.java
+++ b/src/explorviz/hpc_monitoring/record/Trace.java
@@ -57,6 +57,10 @@ public class Trace implements IFlowRecord {
return hostname;
}
+ public String getApplication() {
+ return "MonitoredApplication"; // TODO
+ }
+
public long getParentTraceId() {
return parentTraceId;
}
diff --git a/src/explorviz/worker/main/WorkerController.xtend b/src/explorviz/worker/main/WorkerController.xtend
index 75b72823c60bb4bb2d11e37d58e1a42b8ba96abe..fb8b78f836f794f3a1e8576ea86997ced7805f0f 100644
--- a/src/explorviz/worker/main/WorkerController.xtend
+++ b/src/explorviz/worker/main/WorkerController.xtend
@@ -8,7 +8,6 @@ import kieker.analysis.plugin.filter.forward.TeeFilter
import kieker.analysis.plugin.reader.timer.TimeReader
import explorviz.hpc_monitoring.filter.EventRecordTraceReconstructionFilter
import explorviz.hpc_monitoring.filter.TraceEventRecordAggregationFilter
-import explorviz.hpc_monitoring.connector.RabbitMQConnector
import explorviz.hpc_monitoring.reader.TCPReader
import explorviz.hpc_monitoring.filter.CountingThroughputFilter
@@ -32,15 +31,15 @@ class WorkerController {
EventRecordTraceReconstructionFilter::OUTPUT_PORT_NAME_TRACE_VALID, aggregationFilter,
TraceEventRecordAggregationFilter::INPUT_PORT_NAME_TRACES)
- analysisInstance.connect(eventTraceReconstructionFilter,
- EventRecordTraceReconstructionFilter::OUTPUT_PORT_NAME_TRACE_INVALID, tcpConnector,
- RabbitMQConnector::INPUT_PORT_NAME_INVALID_TRACES)
+// analysisInstance.connect(eventTraceReconstructionFilter,
+// EventRecordTraceReconstructionFilter::OUTPUT_PORT_NAME_TRACE_INVALID, tcpConnector,
+// RabbitMQConnector::INPUT_PORT_NAME_INVALID_TRACES)
analysisInstance.connect(timer, TimeReader::OUTPUT_PORT_NAME_TIMESTAMPS, aggregationFilter,
TraceEventRecordAggregationFilter::INPUT_PORT_NAME_TIME_EVENT)
- analysisInstance.connect(aggregationFilter,
- TraceEventRecordAggregationFilter::OUTPUT_PORT_NAME_TRACES, tcpConnector,
- RabbitMQConnector::INPUT_PORT_NAME_VALID_TRACES)
+// analysisInstance.connect(aggregationFilter,
+// TraceEventRecordAggregationFilter::OUTPUT_PORT_NAME_TRACES, tcpConnector,
+// RabbitMQConnector::INPUT_PORT_NAME_VALID_TRACES)
try {
analysisInstance.run()
} catch (Exception e) {
@@ -67,10 +66,10 @@ class WorkerController {
}
def initTCPConnector() {
- val rabbitConfig = new Configuration()
- rabbitConfig.setProperty(RabbitMQConnector::CONFIG_PROPERTY_NAME_PROVIDER, "localhost")
- rabbitConfig.setProperty(RabbitMQConnector::CONFIG_PROPERTY_NAME_QUEUE, "validTraces")
- new RabbitMQConnector(rabbitConfig, analysisInstance)
+// val rabbitConfig = new Configuration()
+// rabbitConfig.setProperty(RabbitMQConnector::CONFIG_PROPERTY_NAME_PROVIDER, "localhost")
+// rabbitConfig.setProperty(RabbitMQConnector::CONFIG_PROPERTY_NAME_QUEUE, "validTraces")
+// new RabbitMQConnector(rabbitConfig, analysisInstance)
}
def initAggregationFilter() {