From 1e421767655ea4db4555364f1a7f6fd15e094f46 Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Wed, 18 Aug 2021 17:50:18 +0200
Subject: [PATCH] Check for moobench.jar existence
---
frameworks/common-functions.sh | 17 +++++++++++++++++
frameworks/inspectIT/benchmark.sh | 2 ++
frameworks/opentelemetry/benchmark.sh | 18 ++----------------
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index f283288..87a7610 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 5b15741..9aa21da 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 9599267..7e9afc8 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]"
--
GitLab