diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index f2832884c958f6fce64e89ea165e2a883d0ec0b1..87a7610a5649169d7c62a7feb9681b96359d8879 100644 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -12,6 +12,14 @@ function cleanup-results() { [ -f ${DATA_DIR}/nohup.out ] && > ${DATA_DIR}/nohup.out } +function checkMoobenchApplication() { + if [ ! -f "MooBench.jar" ] + then + echo "MooBench.jar missing; please build it first using ../gradlew assemble in the benchmark folder" + exit 1 + fi +} + function getKiekerAgent() { echo "Checking whether Kieker is present in $AGENT" if [ ! -f $AGENT ] @@ -33,6 +41,15 @@ function getInspectItAgent() { fi } +function getOpentelemetryAgent() { + if [ ! -f ${BASEDIR}lib/opentelemetry-javaagent-all.jar ] + then + mkdir -p ${BASEDIR}lib + wget --output-document=${BASEDIR}lib/opentelemetry-javaagent-all.jar \ + https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent-all.jar + fi +} + function createRLabels() { # Create R labels LABELS="" diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh index 5b15741feb0a3fe801f870fab131dcbe0cefd669..9aa21da2408dfead49ca4133ce838d53300ded2f 100755 --- a/frameworks/inspectIT/benchmark.sh +++ b/frameworks/inspectIT/benchmark.sh @@ -62,6 +62,8 @@ RESULTSDIR="${BASEDIR}results-inspectit/" source ../common-functions.sh +checkMoobenchApplication + getInspectItAgent #MOREPARAMS="--quickstart" diff --git a/frameworks/opentelemetry/benchmark.sh b/frameworks/opentelemetry/benchmark.sh index 9599267efa959d6d2ff6ceeb90c0118bd678e9bf..7e9afc8f5c51506673fdf2ca161cba0c6af37ad3 100755 --- a/frameworks/opentelemetry/benchmark.sh +++ b/frameworks/opentelemetry/benchmark.sh @@ -153,16 +153,6 @@ function printIntermediaryResults { fi } -function downloadOpentelemetry() { - if [ ! -f ${BASEDIR}lib/opentelemetry-javaagent-all.jar ] - then - mkdir -p ${BASEDIR}lib - wget --output-document=${BASEDIR}lib/opentelemetry-javaagent-all.jar \ - https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent-all.jar - fi -} - - JAVABIN="" RSCRIPTDIR=r/ @@ -194,13 +184,9 @@ JAVAARGS="${JAVAARGS} -Xms1G -Xmx2G" JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation" JAR="-jar MooBench.jar" -if [ ! -f "MooBench.jar" ] -then - echo "MooBench.jar missing; please build it first using ../gradlew assemble in the benchmark folder" - exit 1 -fi +checkMoobenchApplication -downloadOpentelemetry +getOpentelemetryAgent JAVAARGS_NOINSTR="${JAVAARGS}" JAVAARGS_OPENTELEMETRY_BASIC="${JAVAARGS} -javaagent:${BASEDIR}lib/opentelemetry-javaagent-all.jar -Dotel.resource.attributes=service.name=moobench -Dotel.instrumentation.methods.include=moobench.application.MonitoredClassSimple[monitoredMethod];moobench.application.MonitoredClassThreaded[monitoredMethod]"