Fix creation of JSON to request external slo

slope-evaluator/app/main.py

@@ -46,6 +46,13 @@ def execute(results, threshold, warmup):
 @app.post("/evaluate-slope",response_model=bool)
 async def evaluate_slope(request: Request):
     data = json.loads(await request.body())
-    return execute(data['total_lag'], data['threshold'], data['warmup'])
+    results = []
+    for total_lag in data['total_lags']:
+        results.append(execute(total_lag, data['threshold'], data['warmup'] ))
+    
+    for result in results:
+        if not result:
+            return False
+    return True 
 
 logger.info("Slope evaluator is online")
\ No newline at end of file

slope-evaluator/requirements.txt

 fastapi==0.55.1
 scikit-learn==0.20.3
 pandas==1.0.3
+uvicorn

theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt

@@ -20,7 +20,7 @@ class AnalysisExecutor(private val slo: BenchmarkExecution.Slo) {
         var result = false
         val exporter = CsvExporter()
         val prometheusData = executionIntervals.map { interval -> fetcher.fetchMetric( start = interval.first, end = interval.second, query = "sum by(group)(kafka_consumergroup_group_lag >= 0)") }
-        var repetitionCounter = 0
+        var repetitionCounter = 1
         prometheusData.forEach{ data -> exporter.toCsv(name = "${load.get()}_${res.get()}_${slo.sloType}_rep_${repetitionCounter++}", prom = data) }
         prometheusData.forEach { logger.info { "prom-data: $it" }}
 

theodolite-quarkus/src/main/kotlin/theodolite/evaluation/ExternalSloChecker.kt

@@ -21,14 +21,14 @@ class ExternalSloChecker(
 
     override fun evaluate(fetchedData: List<PrometheusResponse>): Boolean {
         var counter = 0
-        var requestData = fetchedData.map { entry -> Gson().toJson(mapOf("total_lag" to entry.data?.result)) }.toMutableList()
-        requestData.add(mapOf("threshold" to threshold).toString())
-        requestData.add(mapOf("warmup" to warmup).toString())
-
 
+        val data = Gson().toJson(mapOf(
+            "total_lags" to fetchedData.map { it.data?.result },
+            "threshold" to threshold,
+            "warmup" to warmup))
 
         while (counter < RETRIES) {
-            val result = post(externalSlopeURL, data = requestData, timeout = TIMEOUT)
+            val result = post(externalSlopeURL, data = data, timeout = TIMEOUT)
             if (result.statusCode != 200) {
                 counter++
                 logger.error { "Could not reach external slope analysis" }

theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt

@@ -25,6 +25,7 @@ class BenchmarkExecutorImpl(
         val executionIntervals: MutableList<Pair<Instant, Instant>> = ArrayList(repetitions)
 
         for (i in 1.rangeTo(repetitions)) {
+            logger.info { "Run repetition $i/$repetitions" }
             if (this.run.get()) {
                 executionIntervals.add(runSingleExperiment(load,res))
             } else {
@@ -33,7 +34,6 @@ class BenchmarkExecutorImpl(
         }
 
         if (this.run.get()) {
-            executionIntervals.forEach{ logger.info { "interval for evaluation; from: ${it.first}, to: ${it.second}"}}
             result =AnalysisExecutor(slo = slo)
                     .analyze(load = load, res = res, executionIntervals = executionIntervals)
             this.results.setResult(Pair(load, res), result)