From 4b9ceab306e5b0de6d49dafd4d35b23e9b9706df Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Sat, 13 Mar 2021 11:50:08 +0100
Subject: [PATCH] Change object to any in promResponse + fix execution duration
under 1 min
---
.../kotlin/theodolite/execution/BenchmarkExecutor.kt | 9 ++++++---
.../main/kotlin/theodolite/util/PrometheusResponse.kt | 2 +-
.../src/main/resources/yaml/BenchmarkExecution.yaml | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
index d6b644782..d3c2fdcbc 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
@@ -42,9 +42,12 @@ abstract class BenchmarkExecutor(
*/
fun waitAndLog() {
logger.info { "Execution of a new benchmark started." }
- for (i in 1.rangeTo(executionDuration.toMinutes())) {
- Thread.sleep(Duration.ofMinutes(1).toMillis())
- logger.info { "Executed: $i minutes" }
+ for (i in 1.rangeTo(executionDuration.toSeconds())) {
+
+ Thread.sleep(Duration.ofSeconds(1).toMillis())
+ if ((i % 60) == 0L) {
+ logger.info { "Executed: ${i / 60} minutes" }
+ }
}
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/util/PrometheusResponse.kt b/theodolite-quarkus/src/main/kotlin/theodolite/util/PrometheusResponse.kt
index 2c3b86a30..e512bd7ef 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/util/PrometheusResponse.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/util/PrometheusResponse.kt
@@ -12,7 +12,7 @@ data class PromData(
data class PromResult(
var metric: PromMetric? = null,
- var values: List<Object>? = null
+ var values: List<Any>? = null
)
data class PromMetric(
diff --git a/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
index ff51615cf..f1646fb21 100644
--- a/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
@@ -12,7 +12,7 @@ slos:
- sloType: "slo type"
threshold: 1000
prometheusUrl: "http://localhost:32656"
- externalSloUrl: "http://127.0.0.1:8000/evaluate-slope"
+ externalSloUrl: "http://localhost:80/evaluate-slope"
offset: 0
warmup: 0
execution:
--
GitLab