Fixes Open Telemetry

frameworks/OpenTelemetry/benchmark.sh

@@ -55,7 +55,7 @@ info "----------------------------------"
 
 getAgent
 
-checkFile MooBench "${BASE_DIR}/MooBench.jar"
+checkExecutable MooBench "${MOOBENCH_BIN}"
 checkFile log "${BASE_DIR}/OpenTelemetry.log" clean
 checkDirectory results-directory "${RESULTS_DIR}" recreate
 checkExecutable java "${JAVA_BIN}"
@@ -70,7 +70,6 @@ JAVA_ARGS="-server"
 JAVA_ARGS="${JAVA_ARGS} "
 JAVA_ARGS="${JAVA_ARGS} -Xms1G -Xmx2G"
 JAVA_ARGS="${JAVA_ARGS} -verbose:gc "
-JAR="-jar ${BASE_DIR}/MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
 JAVA_ARGS_OPENTELEMETRY_BASIC="${JAVA_ARGS} -javaagent:${AGENT_JAR} -Dotel.resource.attributes=service.name=moobench -Dotel.instrumentation.methods.include=moobench.application.MonitoredClassSimple[monitoredMethod];moobench.application.MonitoredClassThreaded[monitoredMethod]"

frameworks/OpenTelemetry/functions.sh

@@ -56,13 +56,13 @@ function runOpenTelemetryNoLogging {
     k=`expr ${k} + 1`
     info " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
     echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >> "${BASE_DIR}/OpenTelemetry.log"
-    ${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_LOGGING_DEACTIVATED} ${JAR} \
-        --output-filename "${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv" \
+    export BENCHMARK_OPTS="${JAVA_ARGS_OPENTELEMETRY_LOGGING_DEACTIVATED}"
+    "${MOOBENCH_BIN}" --output-filename "${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv" \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
         --recursion-depth ${RECURSION_DEPTH} \
-        ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
+        ${MORE_PARAMS} #&> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
 }
 
 function runOpenTelemetryLogging {
@@ -70,13 +70,13 @@ function runOpenTelemetryLogging {
     k=`expr ${k} + 1`
     info " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
     echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
-    ${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_LOGGING} ${JAR} \
-        --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
+    export BENCHMARK_OPTS="${JAVA_ARGS_OPENTELEMETRY_LOGGING}"
+    "${MOOBENCH_BIN}" --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
         --recursion-depth $RECURSION_DEPTH \
-        ${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+        ${MORE_PARAMS} #&> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
     if [ ! "$DEBUG" = true ]
     then
     	echo "DEBUG is $DEBUG, deleting opentelemetry logging file"
@@ -90,13 +90,13 @@ function runOpenTelemetryZipkin {
     startZipkin
     info " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
     echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >> "${BASE_DIR}/OpenTelemetry.log"
-    ${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_ZIPKIN} ${JAR} \
-        --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
+    export BENCHMARK_OPTS="${JAVA_ARGS_OPENTELEMETRY_ZIPKIN}"
+    "${MOOBENCH_BIN}" --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
         --recursion-depth $RECURSION_DEPTH \
-        ${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+        ${MORE_PARAMS} #&> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
     stopBackgroundProcess
     sleep $SLEEP_TIME
 }
@@ -107,13 +107,13 @@ function runOpenTelemetryJaeger {
 	startJaeger
 	info " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
 	echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >> "${BASE_DIR}/OpenTelemetry.log"
-	${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_JAEGER} ${JAR} \
-		--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
+	export BENCHMARK_OPTS="${JAVA_ARGS_OPENTELEMETRY_JAEGER}"
+	"${MOOBENCH_BIN}" --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
 		--total-calls ${TOTAL_NUM_OF_CALLS} \
 		--method-time ${METHOD_TIME} \
 		--total-threads ${THREADS} \
 		--recursion-depth $RECURSION_DEPTH \
-		${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+		${MORE_PARAMS} #&> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
 	stopBackgroundProcess
 	sleep $SLEEP_TIME
 }
@@ -124,13 +124,13 @@ function runOpenTelemetryPrometheus {
 	startPrometheus
 	info " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
 	echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >> "${BASE_DIR}/OpenTelemetry.log"
-	${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_PROMETHEUS} ${JAR} \
-		--output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
+	export BENCHMARK_OPTS="${JAVA_ARGS_OPENTELEMETRY_PROMETHEUS}"
+	"${MOOBENCH_BIN}" --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
 		--total-calls ${TOTAL_NUM_OF_CALLS} \
 		--method-time ${METHOD_TIME} \
 		--total-threads ${THREADS} \
 		--recursion-depth $RECURSION_DEPTH \
-		${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+		${MORE_PARAMS} #&> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
 	stopBackgroundProcess
 	sleep $SLEEP_TIME
 }