diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh index ab783d70672522a5cec4dde3974380193fb41588..f2832884c958f6fce64e89ea165e2a883d0ec0b1 100644 --- a/frameworks/common-functions.sh +++ b/frameworks/common-functions.sh @@ -47,6 +47,36 @@ function createRLabels() { echo $LABELS } +function startZipkin { + if [ ! -d zipkin ] + then + mkdir zipkin + cd zipkin + curl -sSL https://zipkin.io/quickstart.sh | bash -s + else + cd zipkin + fi + java -Xmx6g -jar zipkin.jar &> zipkin.txt & + sleep 5 + cd .. +} + +function startPrometheus { + if [ ! -d prometheus-2.28.1.linux-amd64 ] + then + wget https://github.com/prometheus/prometheus/releases/download/v2.28.1/prometheus-2.28.1.linux-amd64.tar.gz + tar -xvf prometheus-2.28.1.linux-amd64.tar.gz + rm prometheus-2.28.1.linux-amd64.tar.gz + fi + cd prometheus-2.28.1.linux-amd64 + ./prometheus &> prometheus.log & + cd .. +} + +function stopBackgroundProcess { + kill %1 +} + function writeConfiguration() { uname -a >${RESULTS_DIR}configuration.txt ${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTS_DIR}configuration.txt diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh index 79327cf4fbfe67664836905c4d2d43922bde5775..161d8bb475ea0d8edd63c827eceafd1087a3c0f0 100755 --- a/frameworks/inspectIT/benchmark.sh +++ b/frameworks/inspectIT/benchmark.sh @@ -34,24 +34,6 @@ function runInspectITZipkin { stopBackgroundProcess } -function startZipkin { - if [ ! -d zipkin ] - then - mkdir zipkin - cd zipkin - curl -sSL https://zipkin.io/quickstart.sh | bash -s - else - cd zipkin - fi - java -Xmx6g -jar zipkin.jar &> zipkin.txt & - sleep 5 - cd .. -} - -function stopBackgroundProcess { - kill %1 -} - function cleanup { [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log echo >>${BASEDIR}inspectit.log diff --git a/frameworks/opentelemetry/benchmark.sh b/frameworks/opentelemetry/benchmark.sh index 4a6fa3280d0be926d91dff46370fe07f2c8d6367..9599267efa959d6d2ff6ceeb90c0118bd678e9bf 100755 --- a/frameworks/opentelemetry/benchmark.sh +++ b/frameworks/opentelemetry/benchmark.sh @@ -14,19 +14,6 @@ function startZipkin { cd .. } -function startPrometheus { - if [ ! -d prometheus-2.28.1.linux-amd64 ] - then - wget https://github.com/prometheus/prometheus/releases/download/v2.28.1/prometheus-2.28.1.linux-amd64.tar.gz - tar -xvf prometheus-2.28.1.linux-amd64.tar.gz - rm prometheus-2.28.1.linux-amd64.tar.gz - fi - cd prometheus-2.28.1.linux-amd64 - ./prometheus &> prometheus.log & - cd .. -} - - function startJaeger { if [ ! -d jaeger-1.24.0-linux-amd64 ] then @@ -39,10 +26,6 @@ function startJaeger { cd .. } -function stopBackgroundProcess { - kill %1 -} - function cleanup { [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-$RECURSION_DEPTH-${k}.log echo >>${BASEDIR}opentelemetry.log