From f015ef99d0cfe9f042f74256ae00ff6fe7202dab Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Wed, 18 Aug 2021 17:06:12 +0200
Subject: [PATCH] First runnable version with InspectIT ocelot and zipkin

---
 .gitignore                                    |   4 +
 frameworks/common-functions.sh                |  16 ++
 .../inspectIT/Benchmark (inspectIT).launch    |  14 --
 .../benchmark-isequence-inner-remote.sh       | 213 -----------------
 .../benchmark-isequence-inner-threaded.sh     | 226 ------------------
 .../inspectIT/benchmark-isequence-inner.sh    | 224 -----------------
 frameworks/inspectIT/benchmark.sh             |  54 ++---
 .../isequence-remote/inspectit-agent.cfg      |  52 ----
 .../config/isequence/inspectit-agent.cfg      |  52 ----
 .../inspectIT/config/logging-config.xml       | 123 ----------
 .../inspectIT/config/logging.properties       |  10 -
 .../config/minimal/inspectit-agent.cfg        |  52 ----
 .../config/timer/inspectit-agent.cfg          |  53 ----
 frameworks/inspectIT/config/zipkin/zipkin.yml |  15 ++
 14 files changed, 52 insertions(+), 1056 deletions(-)
 delete mode 100644 frameworks/inspectIT/Benchmark (inspectIT).launch
 delete mode 100644 frameworks/inspectIT/benchmark-isequence-inner-remote.sh
 delete mode 100644 frameworks/inspectIT/benchmark-isequence-inner-threaded.sh
 delete mode 100644 frameworks/inspectIT/benchmark-isequence-inner.sh
 delete mode 100644 frameworks/inspectIT/config/isequence-remote/inspectit-agent.cfg
 delete mode 100644 frameworks/inspectIT/config/isequence/inspectit-agent.cfg
 delete mode 100644 frameworks/inspectIT/config/logging-config.xml
 delete mode 100644 frameworks/inspectIT/config/logging.properties
 delete mode 100644 frameworks/inspectIT/config/minimal/inspectit-agent.cfg
 delete mode 100644 frameworks/inspectIT/config/timer/inspectit-agent.cfg
 create mode 100644 frameworks/inspectIT/config/zipkin/zipkin.yml

diff --git a/.gitignore b/.gitignore
index 60bcf68..346148e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,10 @@ frameworks/inspectIT/inspectit.log
 frameworks/inspectIT/MooBench.jar
 frameworks/inspectIT/logs/
 frameworks/inspectIT/tmp/
+frameworks/inspectIT/zipkin/
+frameworks/inspectIT/configuration.txt
+frameworks/inspectIT/results-inspectit/
+frameworks/opentelemetry/results-opentelemetry/
 frameworks/opentelemetry/opentelemetry.log
 frameworks/opentelemetry/tmp/
 frameworks/opentelemetry/*.txt
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index 5505acc..ef87330 100644
--- a/frameworks/common-functions.sh
+++ b/frameworks/common-functions.sh
@@ -37,6 +37,22 @@ function createRLabels() {
 	echo $LABELS
 }
 
+function writeConfiguration() {
+	uname -a >${RESULTS_DIR}configuration.txt
+	${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTS_DIR}configuration.txt
+	echo "JAVAARGS: ${JAVAARGS}" >>${RESULTS_DIR}configuration.txt
+	echo "" >>${RESULTS_DIR}configuration.txt
+	echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
+	echo "" >>${RESULTS_DIR}configuration.txt
+	echo "SLEEPTIME=${SLEEPTIME}" >>${RESULTS_DIR}configuration.txt
+	echo "NUM_OF_LOOPS=${NUM_OF_LOOPS}" >>${RESULTS_DIR}configuration.txt
+	echo "TOTAL_NUM_OF_CALLS=${TOTAL_NUM_OF_CALLS}" >>${RESULTS_DIR}configuration.txt
+	echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
+	echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
+	echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
+	sync
+}
+
 # Initialize all unset parameters
 if [ -z $SLEEP_TIME ]; then
 	SLEEP_TIME=30           ## 30
diff --git a/frameworks/inspectIT/Benchmark (inspectIT).launch b/frameworks/inspectIT/Benchmark (inspectIT).launch
deleted file mode 100644
index 19365e3..0000000
--- a/frameworks/inspectIT/Benchmark (inspectIT).launch	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/MooBench/src/mooBench/benchmark/Benchmark.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000 -o tmp/test.txt -q"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/inspectIT/agent/inspectit-agent-mod.jar&#13;&#10;-Dinspectit.config=frameworks/inspectIT/config/isequence/"/>
-</launchConfiguration>
diff --git a/frameworks/inspectIT/benchmark-isequence-inner-remote.sh b/frameworks/inspectIT/benchmark-isequence-inner-remote.sh
deleted file mode 100644
index 57bdc79..0000000
--- a/frameworks/inspectIT/benchmark-isequence-inner-remote.sh
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/bin/bash
-
-JAVABIN="/localhome/jwa/jre/bin/"
-REMOTEHOST="blade1"
-REMOTEBASEDIR="/localhome/jwa/MooBench-inspectIT/"
-
-RSCRIPTDIR=r/
-BASEDIR=./
-RESULTSDIR="${BASEDIR}tmp/results-inspectit-isequence/"
-
-SLEEPTIME=30           ## 30
-NUM_LOOPS=10           ## 10
-THREADS=1              ## 1
-RECURSIONDEPTH=10      ## 10
-TOTALCALLS=2000000     ## 2000000
-METHODTIME=0           ## 0
-
-#MOREPARAMS="--quickstart"
-MOREPARAMS="${MOREPARAMS}"
-
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
-echo "Experiment will take circa ${TIME} seconds."
-
-echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf ${RESULTSDIR}) && mkdir ${RESULTSDIR}
-mkdir ${RESULTSDIR}stat/
-
-# Clear inspectit.log and initialize logging
-rm -f ${BASEDIR}inspectit.log
-touch ${BASEDIR}inspectit.log
-
-RAWFN="${RESULTSDIR}raw"
-
-JAVAARGS="-server"
-JAVAARGS="${JAVAARGS} -d64"
-JAVAARGS="${JAVAARGS} -Xms1G -Xmx4G"
-JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
-#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
-#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
-#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar MooBench.jar"
-
-JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent-mod.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties  -Dinspectit.config=${BASEDIR}config/isequence-remote/"
-JAVAARGS_INSPECTIT_DISABLED="${JAVAARGS_LTW} -Dinspectit.disableProbe=true"
-JAVAARGS_INSPECTIT_NOSTORAGE="${JAVAARGS_LTW} -Dinspectit.disableStorage=true"
-JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW}"
-
-CMR_ARGS="-d64 -Xms12G -Xmx12G -Xmn4G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=CMR/logging-config.xml"
-
-## Write configuration
-uname -a >${RESULTSDIR}configuration.txt
-${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
-echo "JAVAARGS: ${JAVAARGS}" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "Runtime: circa ${TIME} seconds" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "SLEEPTIME=${SLEEPTIME}" >>${RESULTSDIR}configuration.txt
-echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTSDIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTSDIR}configuration.txt
-echo "METHODTIME=${METHODTIME}" >>${RESULTSDIR}configuration.txt
-echo "THREADS=${THREADS}" >>${RESULTSDIR}configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTSDIR}configuration.txt
-sync
-
-## Execute Benchmark
-for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
-    k=0
-    echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}inspectit.log
-
-    # No instrumentation
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (disabled)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (disabled)"
-    echo " # ${i}.${j}.${k} InspectIT (disabled)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java ${CMR_ARGS} -Xloggc:${REMOTEBASEDIR}logs/gc.log -jar ${REMOTEBASEDIR}/CMR/inspectit-cmr-mod.jar 1>>${REMOTEBASEDIR}logs/out.log 2>&1 &"
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_DISABLED} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    ssh ${REMOTEHOST} "pkill -f 'java'"
-    sleep 10
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (no storage)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (no storage)"
-    echo " # ${i}.${j}.${k} InspectIT (no storage)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java ${CMR_ARGS} -Xloggc:${REMOTEBASEDIR}logs/gc.log -jar ${REMOTEBASEDIR}/CMR/inspectit-cmr-mod.jar 1>>${REMOTEBASEDIR}logs/out.log 2>&1 &"
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_NOSTORAGE} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    ssh ${REMOTEHOST} "pkill -f 'java'"
-    sleep 10
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-    
-    # InspectIT (full)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (full)"
-    echo " # ${i}.${j}.${k} InspectIT (full)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "nohup ${JAVABIN}java ${CMR_ARGS} -Xloggc:${REMOTEBASEDIR}logs/gc.log -jar ${REMOTEBASEDIR}/CMR/inspectit-cmr-mod.jar 1>>${REMOTEBASEDIR}logs/out.log 2>&1 &"
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    sleep 10
-    ssh ${REMOTEHOST} "pkill -f 'java'"
-    sleep 10
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-done
-zip -jqr ${RESULTSDIR}stat.zip ${RESULTSDIR}stat
-rm -rf ${RESULTSDIR}stat/
-mv ${BASEDIR}inspectit.log ${RESULTSDIR}inspectit.log
-[ -f ${RESULTSDIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTSDIR}hotspot-*.log >${RESULTSDIR}log.log
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTSDIR}
-
-## Generate Results file
-# Timeseries
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries.r")
-EOF
-# Timeseries-Average
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries-average.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries-average.r")
-EOF
-# Bars
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-outtxt_fn="${RESULTSDIR}results-text.txt"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}*3/4
-source("${RSCRIPTDIR}stats.r")
-EOF
-
-## Clean up raw results
-zip -jqr ${RESULTSDIR}results.zip ${RAWFN}*
-rm -f ${RAWFN}*
-[ -f ${BASEDIR}nohup.out ] && cp ${BASEDIR}nohup.out ${RESULTSDIR}
-[ -f ${BASEDIR}nohup.out ] && > ${BASEDIR}nohup.out
diff --git a/frameworks/inspectIT/benchmark-isequence-inner-threaded.sh b/frameworks/inspectIT/benchmark-isequence-inner-threaded.sh
deleted file mode 100644
index 8babe36..0000000
--- a/frameworks/inspectIT/benchmark-isequence-inner-threaded.sh
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/bin/bash
-
-JAVABIN=""
-
-RSCRIPTDIR=r/
-BASEDIR=./
-RESULTSDIR="${BASEDIR}tmp/results-inspectit-isequence/"
-
-SLEEPTIME=30          ## 30
-NUM_LOOPS=10          ## 10
-THREADS=32            ## 32
-RECURSIONDEPTH=10     ## 10
-TOTALCALLS=200000     ## 2000000
-METHODTIME=0          ## 0
-
-#MOREPARAMS="--quickstart"
-MOREPARAMS="${MOREPARAMS}"
-
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
-echo "Experiment will take circa ${TIME} seconds."
-
-echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf ${RESULTSDIR}) && mkdir ${RESULTSDIR}
-mkdir ${RESULTSDIR}stat/
-
-# Clear inspectit.log and initialize logging
-rm -f ${BASEDIR}inspectit.log
-touch ${BASEDIR}inspectit.log
-mkdir ${BASEDIR}logs/
-
-RAWFN="${RESULTSDIR}raw"
-
-JAVAARGS="-server"
-JAVAARGS="${JAVAARGS} -d64"
-JAVAARGS="${JAVAARGS} -Xms1G -Xmx4G"
-JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
-#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
-#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
-#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar MooBench.jar"
-
-JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent-mod.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties  -Dinspectit.config=${BASEDIR}config/isequence/"
-JAVAARGS_INSPECTIT_DISABLED="${JAVAARGS_LTW} -Dinspectit.disableProbe=true"
-JAVAARGS_INSPECTIT_NOSTORAGE="${JAVAARGS_LTW} -Dinspectit.disableStorage=true"
-JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW}"
-
-CMR_ARGS="-d64 -Xms12G -Xmx12G -Xmn4G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=CMR/logging-config.xml"
-
-## Write configuration
-uname -a >${RESULTSDIR}configuration.txt
-${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
-echo "JAVAARGS: ${JAVAARGS}" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "Runtime: circa ${TIME} seconds" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "SLEEPTIME=${SLEEPTIME}" >>${RESULTSDIR}configuration.txt
-echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTSDIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTSDIR}configuration.txt
-echo "METHODTIME=${METHODTIME}" >>${RESULTSDIR}configuration.txt
-echo "THREADS=${THREADS}" >>${RESULTSDIR}configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTSDIR}configuration.txt
-sync
-
-## Execute Benchmark
-for ((j=1;i<=${THREADS};j+=1)); do
-for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    k=0
-    echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}inspectit.log
-
-    # No instrumentation
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${j} \
-        --recursiondepth ${RECURSIONDEPTH} \
-        ${MOREPARAMS}
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (disabled)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (disabled)"
-    echo " # ${i}.${j}.${k} InspectIT (disabled)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_DISABLED} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${j} \
-        --recursiondepth ${RECURSIONDEPTH} \
-        ${MOREPARAMS}
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (no storage)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (no storage)"
-    echo " # ${i}.${j}.${k} InspectIT (no storage)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_NOSTORAGE} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${j} \
-        --recursiondepth ${RECURSIONDEPTH} \
-        ${MOREPARAMS}
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-    
-    # InspectIT (full)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (full)"
-    echo " # ${i}.${j}.${k} InspectIT (full)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${j} \
-        --recursiondepth ${RECURSIONDEPTH} \
-        ${MOREPARAMS}
-    sleep 10
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-done
-done
-zip -jqr ${RESULTSDIR}stat.zip ${RESULTSDIR}stat
-rm -rf ${RESULTSDIR}stat/
-mv ${BASEDIR}logs/ ${RESULTSDIR}
-mv ${BASEDIR}inspectit.log ${RESULTSDIR}inspectit.log
-[ -f ${RESULTSDIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTSDIR}hotspot-*.log >${RESULTSDIR}log.log
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTSDIR}
-
-## Generate Results file
-# Timeseries
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.threads=c(1:${THREADS})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries-threads.r")
-EOF
-# Timeseries-Average
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries-average.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.threads=c(1:${THREADS})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries-average.r")
-EOF
-# Bars
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-outtxt_fn="${RESULTSDIR}results-text.txt"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.threads=c(1:${THREADS})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}*3/4
-source("${RSCRIPTDIR}stats.r")
-EOF
-
-## Clean up raw results
-zip -jqr ${RESULTSDIR}results.zip ${RAWFN}*
-rm -f ${RAWFN}*
-[ -f ${BASEDIR}nohup.out ] && cp ${BASEDIR}nohup.out ${RESULTSDIR}
-[ -f ${BASEDIR}nohup.out ] && > ${BASEDIR}nohup.out
diff --git a/frameworks/inspectIT/benchmark-isequence-inner.sh b/frameworks/inspectIT/benchmark-isequence-inner.sh
deleted file mode 100644
index 435f452..0000000
--- a/frameworks/inspectIT/benchmark-isequence-inner.sh
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/bin/bash
-
-JAVABIN=""
-
-RSCRIPTDIR=r/
-BASEDIR=./
-RESULTSDIR="${BASEDIR}tmp/results-inspectit-isequence/"
-
-SLEEPTIME=30           ## 30
-NUM_LOOPS=10           ## 10
-THREADS=1              ## 1
-RECURSIONDEPTH=10      ## 10
-TOTALCALLS=2000000     ## 2000000
-METHODTIME=0           ## 0
-
-#MOREPARAMS="--quickstart"
-MOREPARAMS="${MOREPARAMS}"
-
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEPTIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
-echo "Experiment will take circa ${TIME} seconds."
-
-echo "Removing and recreating '$RESULTSDIR'"
-(rm -rf ${RESULTSDIR}) && mkdir ${RESULTSDIR}
-mkdir ${RESULTSDIR}stat/
-
-# Clear inspectit.log and initialize logging
-rm -f ${BASEDIR}inspectit.log
-touch ${BASEDIR}inspectit.log
-mkdir ${BASEDIR}logs/
-
-RAWFN="${RESULTSDIR}raw"
-
-JAVAARGS="-server"
-JAVAARGS="${JAVAARGS} -d64"
-JAVAARGS="${JAVAARGS} -Xms1G -Xmx4G"
-JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
-#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
-#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
-#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
-JAR="-jar MooBench.jar"
-
-JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-agent-mod.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties -Dinspectit.config=${BASEDIR}config/isequence/"
-JAVAARGS_INSPECTIT_DISABLED="${JAVAARGS_LTW} -Dinspectit.disableProbe=true"
-JAVAARGS_INSPECTIT_NOSTORAGE="${JAVAARGS_LTW} -Dinspectit.disableStorage=true"
-JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW}"
-
-CMR_ARGS="-d64 -Xms12G -Xmx12G -Xmn4G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=config/logging-config.xml"
-
-## Write configuration
-uname -a >${RESULTSDIR}configuration.txt
-${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
-echo "JAVAARGS: ${JAVAARGS}" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "Runtime: circa ${TIME} seconds" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "SLEEPTIME=${SLEEPTIME}" >>${RESULTSDIR}configuration.txt
-echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTSDIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTSDIR}configuration.txt
-echo "METHODTIME=${METHODTIME}" >>${RESULTSDIR}configuration.txt
-echo "THREADS=${THREADS}" >>${RESULTSDIR}configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTSDIR}configuration.txt
-sync
-
-## Execute Benchmark
-for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
-    k=0
-    echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}inspectit.log
-
-    # No instrumentation
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (disabled)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (disabled)"
-    echo " # ${i}.${j}.${k} InspectIT (disabled)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_DISABLED} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    sleep 10
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-    # InspectIT (no storage)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (no storage)"
-    echo " # ${i}.${j}.${k} InspectIT (no storage)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java ${JAVAARGS_INSPECTIT_NOSTORAGE} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    sleep 10
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-    
-    # InspectIT (full)
-    k=`expr ${k} + 1`
-    echo " # ${i}.${j}.${k} InspectIT (full)"
-    echo " # ${i}.${j}.${k} InspectIT (full)" >>${BASEDIR}inspectit.log
-    sar -o ${RESULTSDIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
-    sleep 10
-    ${JAVABIN}java  ${JAVAARGS_INSPECTIT_FULL} ${JAR} \
-        --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
-        --methodtime ${METHODTIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
-        ${MOREPARAMS}
-    sleep 10
-    kill $!
-    sleep 10
-    kill -9 $!
-    rm -rf ${BASEDIR}storage/
-    rm -rf ${BASEDIR}db/
-    kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTSDIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}inspectit.log
-    echo >>${BASEDIR}inspectit.log
-    sync
-    sleep ${SLEEPTIME}
-
-done
-zip -jqr ${RESULTSDIR}stat.zip ${RESULTSDIR}stat
-rm -rf ${RESULTSDIR}stat/
-mv ${BASEDIR}logs/ ${RESULTSDIR}
-mv ${BASEDIR}inspectit.log ${RESULTSDIR}inspectit.log
-[ -f ${RESULTSDIR}hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTSDIR}hotspot-*.log >${RESULTSDIR}log.log
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTSDIR}
-
-## Generate Results file
-# Timeseries
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries.r")
-EOF
-# Timeseries-Average
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-output_fn="${RESULTSDIR}results-timeseries-average.pdf"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-tsconf.min=(${METHODTIME}/1000)
-tsconf.max=(${METHODTIME}/1000)+100
-source("${RSCRIPTDIR}timeseries-average.r")
-EOF
-# Bars
-R --vanilla --silent <<EOF
-results_fn="${RAWFN}"
-outtxt_fn="${RESULTSDIR}results-text.txt"
-configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
-configs.labels=c("No Probe","InspectIT (disabled)","InspectIT (no storage)","InspectIT (full)")
-configs.colors=c("black","red","blue","green")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}*3/4
-source("${RSCRIPTDIR}stats.r")
-EOF
-
-## Clean up raw results
-zip -jqr ${RESULTSDIR}results.zip ${RAWFN}*
-rm -f ${RAWFN}*
-[ -f ${BASEDIR}nohup.out ] && cp ${BASEDIR}nohup.out ${RESULTSDIR}
-[ -f ${BASEDIR}nohup.out ] && > ${BASEDIR}nohup.out
diff --git a/frameworks/inspectIT/benchmark.sh b/frameworks/inspectIT/benchmark.sh
index ba90db7..5e9cf45 100755
--- a/frameworks/inspectIT/benchmark.sh
+++ b/frameworks/inspectIT/benchmark.sh
@@ -6,10 +6,10 @@ function runNoInstrumentation {
     echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}inspectit.log
     ${JAVABIN}java ${JAVAARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --total-calls ${TOTALCALLS} \
-        --method-time ${METHODTIME} \
+        --total-calls ${TOTAL_NUM_OF_CALLS} \
+        --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
-        --recursion-depth ${j} \
+        --recursion-depth ${RECURSION_DEPTH} \
         ${MOREPARAMS} &> ${RESULTSDIR}output_"$i"_"$j"_noinstrumentation.txt
 }
 
@@ -20,17 +20,17 @@ function runInspectITZipkin {
     echo " # ${i}.${j}.${k} InspectIT (minimal)" >>${BASEDIR}inspectit.log
     #${JAVABIN}java ${CMR_ARGS} -Xloggc:${BASEDIR}logs/gc.log -jar CMR/inspectit-cmr-mod.jar 1>>${BASEDIR}logs/out.log 2>&1 &
     startZipkin
-    sleep 10
+    sleep $SLEEP_TIME
     echo $JAVAARGS_INSPECTIT_MINIMAL
     echo $JAR
     ${JAVABIN}java ${JAVAARGS_INSPECTIT_MINIMAL} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --total-calls ${TOTALCALLS} \
-        --method-time ${METHODTIME} \
+        --total-calls ${TOTAL_NUM_OF_CALLS} \
+        --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
-        --recursion-depth ${j} \
+        --recursion-depth ${RECURSION_DEPTH} \
         ${MOREPARAMS} &> ${RESULTSDIR}output_"$i"_"$j"_inspectit.txt
-    sleep 10
+    sleep $SLEEP_TIME
     stopBackgroundProcess
 }
 
@@ -40,8 +40,9 @@ function startZipkin {
 		mkdir zipkin
 		cd zipkin
 		curl -sSL https://zipkin.io/quickstart.sh | bash -s
+	else
+		cd zipkin
 	fi
-	cd zipkin
 	java -Xmx6g -jar zipkin.jar &> zipkin.txt &
 	sleep 5
 	cd ..
@@ -56,7 +57,7 @@ function cleanup {
 	echo >>${BASEDIR}inspectit.log
 	echo >>${BASEDIR}inspectit.log
 	sync
-	sleep ${SLEEPTIME}
+	sleep ${SLEEP_TIME}
 }
 
 function getSum {
@@ -75,14 +76,9 @@ JAVABIN=""
 
 RSCRIPTDIR=r/
 BASEDIR=./
-RESULTSDIR="${BASEDIR}tmp/results-inspectit/"
+RESULTSDIR="${BASEDIR}results-inspectit/"
 
-SLEEPTIME=30           ## 30
-NUM_LOOPS=10           ## 10
-THREADS=1              ## 1
-RECURSIONDEPTH=10      ## 10
-TOTALCALLS=2000000     ## 2000000
-METHODTIME=0           ## 0
+source ../common-functions.sh
 
 if [ ! -d agent ]
 then
@@ -112,32 +108,16 @@ RAWFN="${RESULTSDIR}raw"
 JAVAARGS="-server"
 JAVAARGS="${JAVAARGS} -Xms1G -Xmx2G"
 JAVAARGS="${JAVAARGS} -verbose:gc -XX:+PrintCompilation"
-#JAVAARGS="${JAVAARGS} -XX:+PrintInlining"
-#JAVAARGS="${JAVAARGS} -XX:+UnlockDiagnosticVMOptions -XX:+LogCompilation"
-#JAVAARGS="${JAVAARGS} -Djava.compiler=NONE"
 JAR="-jar MooBench.jar --application moobench.application.MonitoredClassSimple"
 
 JAVAARGS_NOINSTR="${JAVAARGS}"
 JAVAARGS_LTW="${JAVAARGS} -javaagent:${BASEDIR}agent/inspectit-ocelot-agent-1.10.1.jar -Djava.util.logging.config.file=${BASEDIR}config/logging.properties"
-JAVAARGS_INSPECTIT_MINIMAL="${JAVAARGS_LTW} -Dinspectit.service-name='My-Custom-Service' -Dinspectit.exporters.tracing.zipkin.url=http://127.0.0.1:9411/api/v2/spans -Dinspectit.config.file-based.path=${BASEDIR}config/isequence/"
+JAVAARGS_INSPECTIT_MINIMAL="${JAVAARGS_LTW} -Dinspectit.service-name='My-Custom-Service' -Dinspectit.exporters.tracing.zipkin.url=http://127.0.0.1:9411/api/v2/spans -Dinspectit.config.file-based.path=${BASEDIR}config/zipkin/"
 JAVAARGS_INSPECTIT_FULL="${JAVAARGS_LTW} -Dinspectit.config=${BASEDIR}config/timer/"
 
-CMR_ARGS=" -Xms12G -Xmx12G -Xmn4G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dinspectit.logging.config=config/logging-config.xml"
-
-## Write configuration
-uname -a >${RESULTSDIR}configuration.txt
-${JAVABIN}java ${JAVAARGS} -version 2>>${RESULTSDIR}configuration.txt
-echo "JAVAARGS: ${JAVAARGS}" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "Runtime: circa ${TIME} seconds" >>${RESULTSDIR}configuration.txt
-echo "" >>${RESULTSDIR}configuration.txt
-echo "SLEEPTIME=${SLEEPTIME}" >>${RESULTSDIR}configuration.txt
-echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTSDIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTSDIR}configuration.txt
-echo "METHODTIME=${METHODTIME}" >>${RESULTSDIR}configuration.txt
-echo "THREADS=${THREADS}" >>${RESULTSDIR}configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTSDIR}configuration.txt
-sync
+CMR_ARGS=" -Xms12G -Xmx12G -Xmn4G -XX:MaxPermSize=128m -XX:PermSize=128m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:+DisableExplicitGC -XX:SurvivorRatio=4 -XX:TargetSurvivorRatio=90 -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -XX:+UseBiasedLocking -XX:+HeapDumpOnOutOfMemoryError -server -verbose:gc -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution "
+
+writeConfiguration
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
diff --git a/frameworks/inspectIT/config/isequence-remote/inspectit-agent.cfg b/frameworks/inspectIT/config/isequence-remote/inspectit-agent.cfg
deleted file mode 100644
index 6ca618a..0000000
--- a/frameworks/inspectIT/config/isequence-remote/inspectit-agent.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-## repository <IP> <port> <Agent Name>
-#############################################
-repository blade1 9070 inspectIT
-
-## method-sensor-type <name> <fully-qualified-name> <priority> [<additional options>]
-#####################################################################################
-# method-sensor-type average-timer info.novatec.inspectit.agent.sensor.method.averagetimer.AverageTimerSensor HIGH stringLength=100
-method-sensor-type timer info.novatec.inspectit.agent.sensor.method.timer.TimerSensor MAX stringLength=100
-method-sensor-type isequence info.novatec.inspectit.agent.sensor.method.invocationsequence.InvocationSequenceSensor INVOC stringLength=100
-method-sensor-type jdbc-connection info.novatec.inspectit.agent.sensor.method.jdbc.ConnectionSensor MIN
-method-sensor-type jdbc-prepared-statement info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementSensor MIN stringLength=1000
-method-sensor-type jdbc-prepared-statement-parameter info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementParameterSensor MIN
-method-sensor-type jdbc-statement info.novatec.inspectit.agent.sensor.method.jdbc.StatementSensor MIN stringLength=1000
-
-## exception-sensor-type <fully-qualified-name> [<additional options>]
-######################################################################
-exception-sensor-type info.novatec.inspectit.agent.sensor.exception.ExceptionSensor mode=simple stringLength=500
-
-## platform-sensor-type <fully-qualified-name> [<additional options>]
-#####################################################################
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ClassLoadingInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CompilationInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.MemoryInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CpuInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.RuntimeInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.SystemInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformation
-
-## send-strategy <fully-qualified-name>
-#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
-#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
-
-## buffer-strategy <fully-qualified-name>
-#########################################
-#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
-
-## Ignore classes settings
-#########################################
-exclude-class info.novatec.inspectit.*
-exclude-class $Proxy*
-exclude-class sun.*
-exclude-class java.lang.ThreadLocal
-exclude-class java.lang.ref.Reference
-exclude-class *_WLStub
-exclude-class *[]
-
-## INSTRUMENTATION
-##################
-sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
-#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/isequence/inspectit-agent.cfg b/frameworks/inspectIT/config/isequence/inspectit-agent.cfg
deleted file mode 100644
index a8c46a1..0000000
--- a/frameworks/inspectIT/config/isequence/inspectit-agent.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-## repository <IP> <port> <Agent Name>
-#############################################
-repository localhost 9070 inspectIT
-
-## method-sensor-type <name> <fully-qualified-name> <priority> [<additional options>]
-#####################################################################################
-# method-sensor-type average-timer info.novatec.inspectit.agent.sensor.method.averagetimer.AverageTimerSensor HIGH stringLength=100
-method-sensor-type timer info.novatec.inspectit.agent.sensor.method.timer.TimerSensor MAX stringLength=100
-method-sensor-type isequence info.novatec.inspectit.agent.sensor.method.invocationsequence.InvocationSequenceSensor INVOC stringLength=100
-method-sensor-type jdbc-connection info.novatec.inspectit.agent.sensor.method.jdbc.ConnectionSensor MIN
-method-sensor-type jdbc-prepared-statement info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementSensor MIN stringLength=1000
-method-sensor-type jdbc-prepared-statement-parameter info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementParameterSensor MIN
-method-sensor-type jdbc-statement info.novatec.inspectit.agent.sensor.method.jdbc.StatementSensor MIN stringLength=1000
-
-## exception-sensor-type <fully-qualified-name> [<additional options>]
-######################################################################
-exception-sensor-type info.novatec.inspectit.agent.sensor.exception.ExceptionSensor mode=simple stringLength=500
-
-## platform-sensor-type <fully-qualified-name> [<additional options>]
-#####################################################################
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ClassLoadingInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CompilationInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.MemoryInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CpuInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.RuntimeInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.SystemInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformation
-
-## send-strategy <fully-qualified-name>
-#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
-#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
-
-## buffer-strategy <fully-qualified-name>
-#########################################
-#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
-
-## Ignore classes settings
-#########################################
-exclude-class info.novatec.inspectit.*
-exclude-class $Proxy*
-exclude-class sun.*
-exclude-class java.lang.ThreadLocal
-exclude-class java.lang.ref.Reference
-exclude-class *_WLStub
-exclude-class *[]
-
-## INSTRUMENTATION
-##################
-sensor isequence moobench.application.MonitoredClassSimple monitoredMethod interface=true
-#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/logging-config.xml b/frameworks/inspectIT/config/logging-config.xml
deleted file mode 100644
index 7c507db..0000000
--- a/frameworks/inspectIT/config/logging-config.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-	<!-- The appenders are defined at the top -->
-	
-	<!-- Console output -->
-	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-		<Target>System.out</Target>
-		<encoder>
-			<pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- Statistics -->
-	<appender name="statistics" class="ch.qos.logback.core.FileAppender">
-		<file>logs/statistics.log</file>
-		<encoder>
-			<pattern>%d{ISO8601}: %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- Enriched Sysout -->
-	<!-- Rollover every day or when file reaches 20MB -->
-	<appender name="file" class="ch.qos.logback.core.FileAppender">
-		<file>logs/cmr.log</file>
-		<encoder>
-			<pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<!-- Exceptions -->
-	<!-- Only warn & error levels-->
-	<appender name="exceptions" class="ch.qos.logback.core.FileAppender">
-		<file>logs/exceptions.log</file>
-		<encoder>
-			<pattern>%d{ISO8601}: %-6r [%15.15t] %-5p %30.30c - %m%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-	</appender>
-
-	<!-- Loggers are defined from down here -->
-
-	<!-- set log levels - for more verbose logging change 'info' to 'debug' -->
-	<root level="info">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-		<appender-ref ref="exceptions" />
-	</root>
-
-	<!-- deactivate all other loggers, except for errors -->
-	<logger name="org" level="error" />
-	<logger name="com" level="error" />
-	<logger name="uk" level="error" />
-
-	<!-- service logging, set this to 'debug' to get additional information about: - Number of timer objects being stored - information about the exception sensor - information about the combined metric sensor -->
-	<logger name="info.novatec.inspectit.cmr.service" level="info" />
-	
-	<!-- service logging, set this to 'debug' to get additional information about: - DAOs -->
-	<logger name="info.novatec.inspectit.cmr.dao" level="info" />
-
-	<!-- RMI Exporter Logging - this logger provides the information to which ip/port the RMI services are bound -->
-	<logger name="org.springframework.remoting.rmi" level="info" />
-
-	<!-- This service logs information about the health status of the CMR. By default this is only being logged into a specific file. Set additivity to true if you want to print this information in the default 
-		appender, too. -->
-	<logger name="info.novatec.inspectit.cmr.util.HealthStatus" additivity="false" level="info">
-		<appender-ref ref="statistics" />
-	</logger>
-
-	<!-- Buffer information -->
-	<logger name="info.novatec.inspectit.cmr.cache.impl.AtomicBuffer" level="info" />
-
-	<!-- Storage, set this to debug for more information about: - storage and failed storage serializations -->
-	<logger name="info.novatec.inspectit.storage" level="info" />
-	<logger name="info.novatec.inspectit.cmr.storage" level="info" />
-
-	<!-- Set this to debug for more information about: - IO write/read -->
-	<logger name="info.novatec.inspectit.storage.nio" level="info" />
-	<logger name="info.novatec.inspectit.storage.write" level="info" />
-	
-	<!-- Set this to debug for more information about: - serialization -->
-	<logger name="info.novatec.inspectit.storage.serializer" level="info" />
-
-	<!-- Set this to debug for more information about: - schema loading for serialization -->
-	<logger name="info.novatec.inspectit.storage.serializer.schema" level="info" />
-
-	<!-- Disabled loggers from down here -->
-
-	<!-- hibernate logging -->
-	<!-- logger name="org.hibernate" level="info" / -->
-
-	<!-- log HQL query parser activity -->
-	<!-- logger name="org.hibernate.hql.ast.AST" level="info" / -->
-
-	<!-- log just the SQL -->
-	<!-- logger name="org.hibernate.SQL" level="info" / -->
-
-	<!-- log JDBC bind parameters -->
-	<!-- logger name="org.hibernate.type" level="info" / -->
-
-	<!-- log schema export/update -->
-	<!-- logger name="org.hibernate.tool.hbm2ddl" level="info" / -->
-
-	<!-- log HQL parse trees -->
-	<!-- logger name="org.hibernate.hql" level="debug" / -->
-
-	<!-- log cache activity -->
-	<!-- logger name="org.hibernate.cache" level="info" / -->
-
-	<!-- log transaction activity -->
-	<!-- logger name="org.hibernate.transaction" level="debug" / -->
-
-	<!-- log JDBC resource acquisition -->
-	<!-- logger name="org.hibernate.jdbc" level="debug" / -->
-
-	<!-- enable the following line if you want to track down connection leakages when using DriverManagerConnectionProvider -->
-	<!-- logger name="org.hibernate.connection.DriverManagerConnectionProvider" level="trace" / -->
-
-	<!-- Log only the info level of the c3p0 connection pooling -->
-	<!-- logger name="com.mchange" level="info" / -->
-
-</configuration>
\ No newline at end of file
diff --git a/frameworks/inspectIT/config/logging.properties b/frameworks/inspectIT/config/logging.properties
deleted file mode 100644
index 8beb798..0000000
--- a/frameworks/inspectIT/config/logging.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is the default logging configuration for the inspectIT agent. Feel free
-# to adapt this logging to your needs.
-#
-# To integrate this logging configuration set the "-Djava.util.logging.config.file" Parameter to 
-# point to the configuration (for example: -Djava.util.logging.config.file=[path-to]/logging.properties
-handlers = java.util.logging.FileHandler
-java.util.logging.FileHandler.level = INFO
-java.util.logging.FileHandler.formatter = info.novatec.inspectit.util.MessageFormatFormatter
-java.util.logging.FileHandler.append = true
-java.util.logging.FileHandler.pattern = inspectit.log
diff --git a/frameworks/inspectIT/config/minimal/inspectit-agent.cfg b/frameworks/inspectIT/config/minimal/inspectit-agent.cfg
deleted file mode 100644
index 86963d2..0000000
--- a/frameworks/inspectIT/config/minimal/inspectit-agent.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-## repository <IP> <port> <Agent Name>
-#############################################
-repository localhost 9070 inspectIT
-
-## method-sensor-type <name> <fully-qualified-name> <priority> [<additional options>]
-#####################################################################################
-# method-sensor-type average-timer info.novatec.inspectit.agent.sensor.method.averagetimer.AverageTimerSensor HIGH stringLength=100
-method-sensor-type timer info.novatec.inspectit.agent.sensor.method.timer.TimerSensor MAX stringLength=100
-method-sensor-type isequence info.novatec.inspectit.agent.sensor.method.invocationsequence.InvocationSequenceSensor INVOC stringLength=100
-method-sensor-type jdbc-connection info.novatec.inspectit.agent.sensor.method.jdbc.ConnectionSensor MIN
-method-sensor-type jdbc-prepared-statement info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementSensor MIN stringLength=1000
-method-sensor-type jdbc-prepared-statement-parameter info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementParameterSensor MIN
-method-sensor-type jdbc-statement info.novatec.inspectit.agent.sensor.method.jdbc.StatementSensor MIN stringLength=1000
-
-## exception-sensor-type <fully-qualified-name> [<additional options>]
-######################################################################
-exception-sensor-type info.novatec.inspectit.agent.sensor.exception.ExceptionSensor mode=simple stringLength=500
-
-## platform-sensor-type <fully-qualified-name> [<additional options>]
-#####################################################################
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ClassLoadingInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CompilationInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.MemoryInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CpuInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.RuntimeInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.SystemInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformation
-
-## send-strategy <fully-qualified-name>
-#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
-#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
-
-## buffer-strategy <fully-qualified-name>
-#########################################
-#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
-
-## Ignore classes settings
-#########################################
-exclude-class info.novatec.inspectit.*
-exclude-class $Proxy*
-exclude-class sun.*
-exclude-class java.lang.ThreadLocal
-exclude-class java.lang.ref.Reference
-exclude-class *_WLStub
-exclude-class *[]
-
-## INSTRUMENTATION
-##################
-#sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
-#sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/timer/inspectit-agent.cfg b/frameworks/inspectIT/config/timer/inspectit-agent.cfg
deleted file mode 100644
index c65c99f..0000000
--- a/frameworks/inspectIT/config/timer/inspectit-agent.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-## repository <IP> <port> <Agent Name>
-#############################################
-repository localhost 9070 inspectIT
-
-## method-sensor-type <name> <fully-qualified-name> <priority> [<additional options>]
-#####################################################################################
-# method-sensor-type average-timer info.novatec.inspectit.agent.sensor.method.averagetimer.AverageTimerSensor HIGH stringLength=100
-method-sensor-type timer info.novatec.inspectit.agent.sensor.method.timer.TimerSensor MAX stringLength=100
-method-sensor-type isequence info.novatec.inspectit.agent.sensor.method.invocationsequence.InvocationSequenceSensor INVOC stringLength=100
-method-sensor-type jdbc-connection info.novatec.inspectit.agent.sensor.method.jdbc.ConnectionSensor MIN
-method-sensor-type jdbc-prepared-statement info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementSensor MIN stringLength=1000
-method-sensor-type jdbc-prepared-statement-parameter info.novatec.inspectit.agent.sensor.method.jdbc.PreparedStatementParameterSensor MIN
-method-sensor-type jdbc-statement info.novatec.inspectit.agent.sensor.method.jdbc.StatementSensor MIN stringLength=1000
-
-## exception-sensor-type <fully-qualified-name> [<additional options>]
-######################################################################
-exception-sensor-type info.novatec.inspectit.agent.sensor.exception.ExceptionSensor mode=simple stringLength=500
-
-## platform-sensor-type <fully-qualified-name> [<additional options>]
-#####################################################################
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ClassLoadingInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CompilationInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.MemoryInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.CpuInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.RuntimeInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.SystemInformation
-platform-sensor-type info.novatec.inspectit.agent.sensor.platform.ThreadInformation
-
-## send-strategy <fully-qualified-name>
-#######################################
-send-strategy info.novatec.inspectit.agent.sending.impl.TimeStrategy time=1000
-#send-strategy info.novatec.inspectit.agent.sending.impl.ListSizeStrategy size=10000
-
-## buffer-strategy <fully-qualified-name>
-#########################################
-#buffer-strategy info.novatec.inspectit.agent.buffer.impl.SimpleBufferStrategy
-buffer-strategy info.novatec.inspectit.agent.buffer.impl.SizeBufferStrategy size=1000000
-
-
-## Ignore classes settings
-#########################################
-exclude-class info.novatec.inspectit.*
-exclude-class $Proxy*
-exclude-class sun.*
-exclude-class java.lang.ThreadLocal
-exclude-class java.lang.ref.Reference
-exclude-class *_WLStub
-exclude-class *[]
-
-## INSTRUMENTATION
-##################
-sensor isequence mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true
-sensor timer mooBench.monitoredApplication.MonitoredClass monitoredMethod interface=true charting=true
diff --git a/frameworks/inspectIT/config/zipkin/zipkin.yml b/frameworks/inspectIT/config/zipkin/zipkin.yml
new file mode 100644
index 0000000..340bcca
--- /dev/null
+++ b/frameworks/inspectIT/config/zipkin/zipkin.yml
@@ -0,0 +1,15 @@
+inspectit:
+  instrumentation:
+    scopes:
+      's_moobench':
+        type:
+          name: 'MonitoredClass'
+          matcher-mode: 'CONTAINS'
+    rules:
+      'r_moobench':
+        enabled: true
+        include:
+          'r_trace_method': true # records spans
+          'r_capture_method_duration': true # records metrics
+        scopes:
+          's_moobench': true 
-- 
GitLab