From c2b97e923d9a0c9a78c19b9a98d3ee310d98c5c6 Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Fri, 20 Aug 2021 17:28:59 +0200
Subject: [PATCH] Fix log names
---
.gitignore | 1 +
frameworks/OpenTelemetry/benchmark.sh | 26 +++++++++++++-------------
frameworks/inspectIT/benchmark.sh | 20 ++++++++++----------
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
index 868651f..69aa491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ frameworks/inspectIT/prometheus-2.28.1.linux-amd64/
frameworks/OpenTelemetry/results-OpenTelemetry/
frameworks/OpenTelemetry/tmp/
frameworks/OpenTelemetry/*.txt
+frameworks/OpenTelemetry/OpenTelemetry.log
frameworks/OpenTelemetry/MooBench.jar
frameworks/OpenTelemetry/zipkin/
frameworks/OpenTelemetry/lib/
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
index c57311c..e161c44 100755
--- a/frameworks/OpenTelemetry/benchmark.sh
+++ b/frameworks/OpenTelemetry/benchmark.sh
@@ -14,8 +14,8 @@ function startJaeger {
function cleanup {
[ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-$RECURSION_DEPTH-${k}.log
- echo >>${BASE_DIR}/opentelemetry.log
- echo >>${BASE_DIR}/opentelemetry.log
+ echo >>${BASE_DIR}/OpenTelemetry.log
+ echo >>${BASE_DIR}/OpenTelemetry.log
sync
sleep ${SLEEP_TIME}
}
@@ -23,7 +23,7 @@ function cleanup {
function runNoInstrumentation {
# No instrumentation
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -37,7 +37,7 @@ function runOpenTelemetryNoLogging {
# OpenTelemetry Instrumentation Logging Deactivated
k=`expr ${k} + 1`
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_OPENTELEMETRY_LOGGING_DEACTIVATED} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -51,7 +51,7 @@ function runOpenTelemetryLogging {
# OpenTelemetry Instrumentation Logging
k=`expr ${k} + 1`
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_OPENTELEMETRY_LOGGING} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -71,7 +71,7 @@ function runOpenTelemetryZipkin {
k=`expr ${k} + 1`
startZipkin
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_OPENTELEMETRY_ZIPKIN} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -87,7 +87,7 @@ function runOpenTelemetryJaeger {
k=`expr ${k} + 1`
startJaeger
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_OPENTELEMETRY_JAEGER} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -103,7 +103,7 @@ function runOpenTelemetryPrometheus {
k=`expr ${k} + 1`
startPrometheus
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/opentelemetry.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
${JAVABIN}java ${JAVAARGS_OPENTELEMETRY_PROMETHEUS} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -132,9 +132,9 @@ echo "Cleaning and recreating '$RESULTS_DIR'"
(rm -rf ${RESULTS_DIR}/**csv) && mkdir -p ${RESULTS_DIR}
#mkdir ${RESULTS_DIR}stat/
-# Clear opentelemetry.log and initialize logging
-rm -f ${BASE_DIR}/opentelemetry.log
-touch ${BASE_DIR}/opentelemetry.log
+# Clear OpenTelemetry.log and initialize logging
+rm -f ${BASE_DIR}/OpenTelemetry.log
+touch ${BASE_DIR}/OpenTelemetry.log
JAVAARGS="-server"
JAVAARGS="${JAVAARGS} "
@@ -160,7 +160,7 @@ writeConfiguration
for ((i=1;i<=${NUM_OF_LOOPS};i+=1)); do
k=0
echo "## Starting iteration ${i}/${NUM_OF_LOOPS}"
- echo "## Starting iteration ${i}/${NUM_OF_LOOPS}" >>${BASE_DIR}opentelemetry.log
+ echo "## Starting iteration ${i}/${NUM_OF_LOOPS}" >>${BASE_DIR}/OpenTelemetry.log
runNoInstrumentation
cleanup
@@ -198,7 +198,7 @@ cleanup-results
#zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
#rm -rf ${RESULTS_DIR}stat/
-mv ${BASE_DIR}opentelemetry.log ${RESULTS_DIR}opentelemetry.log
+mv ${BASE_DIR}/OpenTelemetry.log ${RESULTS_DIR}/OpenTelemetry.log
[ -f ${RESULTS_DIR}hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
index ed7a4aa..4f49f3f 100755
--- a/frameworks/inspectIT/benchmark.sh
+++ b/frameworks/inspectIT/benchmark.sh
@@ -3,7 +3,7 @@
function runNoInstrumentation {
# No instrumentation
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}inspectit.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/inspectIT.log
${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
--total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -17,7 +17,7 @@ function runInspectITDeactivated {
# InspectIT (minimal)
k=`expr ${k} + 1`
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}inspectit.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/inspectIT.log
sleep $SLEEP_TIME
${JAVABIN}java ${JAVAARGS_INSPECTIT_DEACTIVATED} ${JAR} \
--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
@@ -35,7 +35,7 @@ function runInspectITZipkin {
# InspectIT (minimal)
k=`expr ${k} + 1`
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}inspectit.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/inspectIT.log
startZipkin
sleep $SLEEP_TIME
${JAVABIN}java ${JAVAARGS_INSPECTIT_ZIPKIN} ${JAR} \
@@ -54,7 +54,7 @@ function runInspectITPrometheus {
# InspectIT (minimal)
k=`expr ${k} + 1`
echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
- echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}inspectit.log
+ echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/inspectIT.log
startPrometheus
sleep $SLEEP_TIME
${JAVABIN}java ${JAVAARGS_INSPECTIT_PROMETHEUS} ${JAR} \
@@ -71,8 +71,8 @@ function runInspectITPrometheus {
function cleanup {
[ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
- echo >>${BASE_DIR}inspectit.log
- echo >>${BASE_DIR}inspectit.log
+ echo >>${BASE_DIR}/inspectIT.log
+ echo >>${BASE_DIR}/inspectIT.log
sync
sleep ${SLEEP_TIME}
}
@@ -103,8 +103,8 @@ echo "Removing and recreating '$RESULTS_DIR'"
(rm -rf ${RESULTS_DIR}/**csv) && mkdir -p ${RESULTS_DIR}
# Clear inspectit.log and initialize logging
-rm -f ${BASE_DIR}/inspectit.log
-touch ${BASE_DIR}/inspectit.log
+rm -f ${BASE_DIR}/inspectIT.log
+touch ${BASE_DIR}/inspectIT.log
JAVAARGS="-server"
JAVAARGS="${JAVAARGS} -Xms1G -Xmx2G"
@@ -125,7 +125,7 @@ writeConfiguration
for ((i=1;i<=${NUM_OF_LOOPS};i+=1)); do
k=0
echo "## Starting iteration ${i}/${NUM_OF_LOOPS}"
- echo "## Starting iteration ${i}/${NUM_OF_LOOPS}" >>${BASE_DIR}/inspectit.log
+ echo "## Starting iteration ${i}/${NUM_OF_LOOPS}" >>${BASE_DIR}/inspectIT.log
runNoInstrumentation
cleanup
@@ -141,7 +141,7 @@ for ((i=1;i<=${NUM_OF_LOOPS};i+=1)); do
printIntermediaryResults
done
-mv ${BASE_DIR}/inspectit.log ${RESULTS_DIR}/inspectit.log
+mv ${BASE_DIR}/inspectIT.log ${RESULTS_DIR}/inspectIT.log
[ -f ${RESULTS_DIR}Hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}hotspot-*.log >${RESULTS_DIR}log.log
[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
--
GitLab