Updated directory structure.

frameworks/Kieker/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation project(':benchmark')
+    implementation project(':tools:benchmark')
     implementation 'net.kieker-monitoring:kieker:1.14'
     implementation 'net.sourceforge.teetime:teetime:3.0'
     implementation 'org.slf4j:slf4j-api:1.7.+'

frameworks/OpenTelemetry/config.rc

@@ -9,4 +9,6 @@ AGENT_JAR="${BASE_DIR}/lib/opentelemetry-javaagent.jar"
 #MORE_PARAMS="--quickstart"
 MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MORE_PARAMS}"
 
+MOOBENCH_BIN="${BASE_DIR}/../../benchmark/bin/benchmark"
+
 

frameworks/OpenTelemetry/functions.sh

@@ -42,13 +42,13 @@ function runNoInstrumentation {
     # No instrumentation
     info " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
     echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
-    ${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
-        --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"
+    export BENCHMARK_OPTS="${JAVA_ARGS_NOINSTR}"
+    "${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"
 }
 
 function runOpenTelemetryNoLogging {

settings.gradle

@@ -9,7 +9,7 @@
 
 rootProject.name = 'moobench'
 
-include 'benchmark'
+include 'tools:benchmark'
 include 'tools:receiver'
 include 'tools:compile-results'
 include 'frameworks:inspectIT'