Create uberjar for receiver instead of execution script

kieker-monitoring · Aug 27, 2024 · 9d1b350 · 9d1b350
1 parent 514d24b
commit 9d1b350
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/frameworks/Kieker-java/benchmark.sh b/frameworks/Kieker-java/benchmark.sh
@@ -81,12 +81,7 @@ mkdir -p $RESULTS_DIR
 PARENT=`dirname "${RESULTS_DIR}"`
 checkDirectory result-base "${PARENT}"
 
-# Find receiver and extract it
-checkFile receiver "${RECEIVER_ARCHIVE}"
-tar -xpf "${RECEIVER_ARCHIVE}"
-RECEIVER_BIN="${BASE_DIR}/receiver/bin/receiver"
-checkExecutable receiver "${RECEIVER_BIN}"
-
+checkFile receiver "receiver/receiver.jar"
 
 checkFile ApsectJ-Agent "${AGENT}"
 checkFile aop-file "${AOP}"
@@ -124,7 +119,7 @@ WRITER_CONFIG[2]="-Dkieker.monitoring.enabled=true -Dkieker.monitoring.writer=ki
 WRITER_CONFIG[3]="-Dkieker.monitoring.enabled=true -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.FileWriter -Dkieker.monitoring.writer.filesystem.FileWriter.logStreamHandler=kieker.monitoring.writer.filesystem.TextLogStreamHandler -Dkieker.monitoring.writer.filesystem.FileWriter.customStoragePath=${DATA_DIR}/"
 WRITER_CONFIG[4]="-Dkieker.monitoring.enabled=true -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.FileWriter -Dkieker.monitoring.writer.filesystem.FileWriter.logStreamHandler=kieker.monitoring.writer.filesystem.BinaryLogStreamHandler -Dkieker.monitoring.writer.filesystem.FileWriter.bufferSize=8192 -Dkieker.monitoring.writer.filesystem.FileWriter.customStoragePath=${DATA_DIR}/ -Dkieker.monitoring.writer.filesystem.FileWriter.maxLogFiles=100 -Dkieker.monitoring.core.controller.WriterController.QueuePutStrategy=kieker.monitoring.queue.putstrategy.YieldPutStrategy"
 WRITER_CONFIG[5]="-Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.SingleSocketTcpWriter -Dkieker.monitoring.writer.tcp.SingleSocketTcpWriter.port=2345"
-RECEIVER[5]="${RECEIVER_BIN} 2345"
+RECEIVER[5]="java -jar receiver/receiver.jar 2345"
 
 
 

diff --git a/frameworks/Kieker-java/config.rc b/frameworks/Kieker-java/config.rc
@@ -11,7 +11,6 @@ RSCRIPT_PATH="${BASE_DIR}/../statistics.r"
 MAIN_DIR="${BASE_DIR}/../.."
 
 MOOBENCH_BIN="${MAIN_DIR}/benchmark/bin/benchmark"
-RECEIVER_ARCHIVE="${MAIN_DIR}/tools/receiver/build/distributions/receiver.tar"
 
 DATA_DIR="${BASE_DIR}/data"
 AGENT="${BASE_DIR}/kieker-2.0.0-SNAPSHOT-aspectj.jar"

diff --git a/tools/receiver/build.gradle b/tools/receiver/build.gradle
@@ -15,10 +15,19 @@ dependencies {
 }
 
 jar {
+    manifest {
+        attributes "Main-Class": "moobench.tools.receiver.RecordReceiverMain"
+    }
+
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+
 	doLast {
 		copy {
 		    from jar
-		    into "../../frameworks/Kieker-java/scripts/receiver/lib/"
+		    into "../../frameworks/Kieker-java/receiver/"
 	    }
 	}
 }