From 5a09fc399e6c792018ca38dfc3de35762c34e1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 31 Mar 2022 17:30:39 +0200
Subject: [PATCH] Improve metrics fetcher logging
---
.../src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt | 2 +-
.../src/main/kotlin/theodolite/evaluation/MetricFetcher.kt | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt b/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
index be3e48be4..b3cc174d2 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
@@ -38,7 +38,7 @@ class AnalysisExecutor(
try {
val ioHandler = IOHandler()
- val resultsFolder: String = ioHandler.getResultFolderURL()
+ val resultsFolder = ioHandler.getResultFolderURL()
val fileURL = "${resultsFolder}exp${executionId}_${load.get()}_${res.get()}_${slo.sloType.toSlug()}"
val prometheusData = executionIntervals
diff --git a/theodolite/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt b/theodolite/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
index e54d79fe0..29f660b67 100644
--- a/theodolite/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
+++ b/theodolite/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
@@ -45,10 +45,11 @@ class MetricFetcher(private val prometheusURL: String, private val offset: Durat
)
while (counter < RETRIES) {
+ logger.info { "Request collected metrics from Prometheus for interval [$offsetStart,$offsetEnd]." }
val response = get("$prometheusURL/api/v1/query_range", params = parameter, timeout = TIMEOUT)
if (response.statusCode != 200) {
val message = response.jsonObject.toString()
- logger.warn { "Could not connect to Prometheus: $message. Retrying now." }
+ logger.warn { "Could not connect to Prometheus: $message. Retry $counter/$RETRIES." }
counter++
} else {
val values = parseValues(response)
--
GitLab