Fix passing metadata

slo-checker/generic/app/main.py

@@ -57,15 +57,14 @@ def check_result(result, operator: str, threshold):
 @app.post("/",response_model=bool)
 async def check_slo(request: Request):
     data = json.loads(await request.body())
+    logger.info('Received request with metadata: %s', data['metadata'])
+
     warmup = int(data['metadata']['warmup'])
     query_aggregation = get_aggr_func(data['metadata']['queryAggregation'])
     rep_aggregation = get_aggr_func(data['metadata']['repetitionAggregation'])
     operator = data['metadata']['operator']
     threshold = int(data['metadata']['threshold'])
 
-    for r in data["results"]:
-        aggr_query(r[0]["values"], warmup, query_aggregation)
-
     query_results = [aggr_query(r[0]["values"], warmup, query_aggregation) for r in data["results"]]
     result = pd.DataFrame(query_results).aggregate(rep_aggregation).at[0]
     return check_result(result, operator, threshold)

theodolite/src/main/kotlin/theodolite/evaluation/SloCheckerFactory.kt

@@ -50,12 +50,11 @@ class SloCheckerFactory {
                 // TODO validate property contents
                 metadata = mapOf(
                     "warmup" to (properties["warmup"]?.toInt() ?: throw IllegalArgumentException("warmup expected")),
-                    "queryAggregation" to (properties["warmup"]?.toInt()
+                    "queryAggregation" to (properties["queryAggregation"]
                         ?: throw IllegalArgumentException("queryAggregation expected")),
-                    "repetitionAggregation" to (properties["warmup"]?.toInt()
+                    "repetitionAggregation" to (properties["repetitionAggregation"]
                         ?: throw IllegalArgumentException("repetitionAggregation expected")),
-                    "operator" to (properties["warmup"]?.toInt()
-                        ?: throw IllegalArgumentException("operator expected")),
+                    "operator" to (properties["operator"] ?: throw IllegalArgumentException("operator expected")),
                     "threshold" to (properties["threshold"]?.toInt()
                         ?: throw IllegalArgumentException("threshold expected"))
                 )