Fixed many path issues. Also needed to update data.

Jenkinsfile

@@ -49,10 +49,10 @@ pipeline {
           sh './frameworks/OpenTelemetry-java/benchmark.sh'
           sh './frameworks/inspectIT-java/benchmark.sh'
 
-          sh 'cp frameworks/Kieker-python/results-Kieker-python/results.yaml kieker-python-results.yaml'
-          sh 'cp frameworks/Kieker-java/results-Kieker-java/results.yaml kieker-java-results.yaml'
-          sh 'cp frameworks/OpenTelemetry-java/results-OpenTelemetry-java/results.yaml open-telementry-results.yaml'
-          sh 'cp frameworks/inspectIT-java/results-inspectIT-java/results.yaml inspect-it-results.yaml'
+          sh 'cp frameworks/Kieker-python/results/results.yaml Kieker-python-results.yaml'
+          sh 'cp frameworks/Kieker-java/results/results.yaml Kieker-java-results.yaml'
+          sh 'cp frameworks/OpenTelemetry-java/results/results.yaml OpenTelemetry-java-results.yaml'
+          sh 'cp frameworks/inspectIT-java/results/results.yaml inspectIT-java-results.yaml'
 
           stash includes: '*-results.yaml', name: 'yaml'
        }

README.md

@@ -19,7 +19,7 @@ For all combinations of supported monitoring frameworks $FRAMEWORK and languages
 - docker = Dockerfile to be used in automated runs on our intrestructure
 - frameworks = benchmark setups for the different frameworks
   - Kieker
-  - OpenTelementry
+  - OpenTelemetry
   - SPASSmeter
   - inspectIT
 - gradle = build system, gradle libraries

common-functions.sh

@@ -245,7 +245,7 @@ function showParameter() {
 }
 
 FRAMEWORK_NAME=$(basename -- "${BASE_DIR}")
-RESULTS_DIR="${BASE_DIR}/results-${FRAMEWORK_NAME}"
+RESULTS_DIR="${BASE_DIR}/results"
 RAWFN="${RESULTS_DIR}/raw"
 
 # Initialize all unset parameters

frameworks/Kieker-java/benchmark.sh

@@ -63,12 +63,6 @@ info "----------------------------------"
 info "Setup..."
 info "----------------------------------"
 
-# This is necessary, as the framework name is originally
-# derived from the directory the script is sitting in, but
-# Kieker supports multiple languages and has multiple
-# sub directories for each programming language.
-export FRAMEWORK_NAME="kieker-${FRAMEWORK_NAME}"
-
 cd "${BASE_DIR}"
 
 # load agent

frameworks/Kieker-java/runExponentialSizes.sh

@@ -14,7 +14,7 @@ else
 	exit 1
 fi
 
-RESULTS_DIR="${BASE_DIR}/results-Kieker-java"
+RESULTS_DIR="${BASE_DIR}/exp-results"
 
 #
 # checks

frameworks/Kieker-python/benchmark.sh

@@ -55,12 +55,6 @@ info "----------------------------------"
 info "Setup..."
 info "----------------------------------"
 
-# This is necessary, as the framework name is originally
-# derived from the directory the script is sitting in, but
-# Kieker supports multiple languages and has multiple
-# sub directories for each programming language.
-export FRAMEWORK_NAME="kieker-${FRAMEWORK_NAME}"
-
 cd "${BASE_DIR}"
 
 # load agent

frameworks/OpenTelemetry-java/config.rc

-# OpenTelementry configuration
+# OpenTelemetry configuration
 
 source ${MAIN_DIR}/config.rc
 

frameworks/OpenTelemetry-java/functions.sh

-# OpenTelementry specific functions
+# OpenTelemetry specific functions
 
 # ensure the script is sourced
 if [ "${BASH_SOURCE[0]}" -ef "$0" ]

frameworks/OpenTelemetry-java/runExponentialSizes.sh

@@ -14,7 +14,7 @@ else
 	exit 1
 fi
 
-RESULTS_DIR="${BASE_DIR}/results-OpenTelemetry"
+RESULTS_DIR="${BASE_DIR}/exp-results"
 
 #
 # checks

frameworks/inspectIT-java/runExponentialSizes.sh

@@ -14,7 +14,7 @@ else
 	exit 1
 fi
 
-RESULTS_DIR="${BASE_DIR}/results-inspectIT"
+RESULTS_DIR="${BASE_DIR}/exp-results"
 
 #
 # checks

run-step.sh

@@ -6,10 +6,10 @@
 ./frameworks/inspectIT-java/benchmark.sh || exit
 
 echo "copy"
-cp -v frameworks/Kieker-python/results-Kieker-python/results.yaml kieker-python-results.yaml
-cp -v frameworks/Kieker-java/results-Kieker-java/results.yaml kieker-java-results.yaml
-cp -v frameworks/OpenTelemetry-java/results-OpenTelemetry-java/results.yaml open-telementry-results.yaml
-cp -v frameworks/inspectIT-java/results-inspectIT-java/results.yaml inspect-it-results.yaml
+cp -v frameworks/Kieker-python/results/results.yaml Kieker-python-results.yaml
+cp -v frameworks/Kieker-java/results/results.yaml Kieker-java-results.yaml
+cp -v frameworks/OpenTelemetry-java/results/results.yaml OpenTelemetry-java-results.yaml
+cp -v frameworks/inspectIT-java/results/results.yaml inspectIT-java-results.yaml
 
 # end
 

upload.sh

@@ -37,34 +37,36 @@ fi
 
 checkExecutable compile-results "${COMPILE_RESULTS_BIN}"
 checkFile keystore "${KEYSTORE}"
+checkDirectory results "${BASE_DIR}/results" recreate
 
 if [ "${UPDATE_SITE_URL}" == "" ] ; then
 	error "Missing UPDATE_SITE_URL"
-	information "Usage: $0 KEYSTORE UPDATE_SITE_URL"
+	info "Usage: $0 KEYSTORE UPDATE_SITE_URL"
 	exit 1
 fi
 
 # Retrieve logs
-information "Get Kieker-java log"
-
-mkdir results
 cd results
-sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/kieker-java-log.yaml
-information "Get Kieker-python log"
-sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/kieker-python-log.yaml
-information "Get OpenTelemetry log"
-sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/OpenTelemetry-log.yaml
-information "Get inspectIT log"
-sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/inspectIT-log.yaml
+
+info "Get Kieker-java log"
+sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/Kieker-java-log.yaml
+
+info "Get Kieker-python log"
+sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/Kieker-python-log.yaml
+
+info "Get OpenTelemetry log"
+sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/OpenTelemetry-java-log.yaml
+
+info "Get inspectIT log"
+sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}/inspectIT-java-log.yaml
 cd ..
-information "Logs retrieved"
 
 # Compute logs and charts
-information "Compute new logs and charts"
+info "Compute new logs and charts"
 "${COMPILE_RESULTS_BIN}" -i *-results.yaml -l results -c results -t results -w 100
 
 # Stash results back onto the update site
-information "Push logs and results"
+info "Push logs and results"
 
 cd results
 echo "put *.yaml" | sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo  -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}
@@ -72,5 +74,5 @@ echo "put *.html" | sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyC
 echo "put *.json" | sftp -oNoHostAuthenticationForLocalhost=yes -oStrictHostKeyChecking=no -oUser=repo  -F /dev/null -i ${KEYSTORE} ${UPDATE_SITE_URL}
 cd ..
 
-information "Done"
+info "Done"
 # end