From 3df0e699fa3445317ed68ab08dae3e468dab396e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Sat, 17 Apr 2021 14:09:20 +0200
Subject: [PATCH] Enhance logging
---
slope-evaluator/app/main.py | 2 +-
.../main/kotlin/theodolite/evaluation/AnalysisExecutor.kt | 2 +-
.../src/main/kotlin/theodolite/evaluation/CsvExporter.kt | 2 +-
.../main/kotlin/theodolite/evaluation/ExternalSloChecker.kt | 4 ++--
.../src/main/kotlin/theodolite/evaluation/MetricFetcher.kt | 6 +++---
.../main/kotlin/theodolite/execution/BenchmarkExecutor.kt | 2 +-
.../kotlin/theodolite/execution/BenchmarkExecutorImpl.kt | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/slope-evaluator/app/main.py b/slope-evaluator/app/main.py
index 83709c0f7..453187eba 100644
--- a/slope-evaluator/app/main.py
+++ b/slope-evaluator/app/main.py
@@ -30,7 +30,7 @@ def execute(results, threshold, warmup):
df = pd.DataFrame(d)
- logger.info(df)
+ logger.info("Calculating trend slope for data frame:\n %s", df)
try:
trend_slope = trend_slope_computer.compute(df, warmup)
except Exception as e:
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
index e76f6cf34..a53ec5ad9 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/AnalysisExecutor.kt
@@ -55,7 +55,7 @@ class AnalysisExecutor(
)
} catch (e: Exception) {
- logger.error { "Evaluation failed for resource: ${res.get()} and load: ${load.get()} error: $e" }
+ logger.error { "Evaluation failed for resource '${res.get()}' and load '${load.get()}'. Error: $e" }
}
return result
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt
index 688628515..2044be5ec 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/CsvExporter.kt
@@ -29,7 +29,7 @@ class CsvExporter {
pw.println(it.joinToString())
}
}
- logger.info { "Wrote csv file: $name to ${csvOutputFile.absolutePath}" }
+ logger.info { "Wrote CSV file: $name to ${csvOutputFile.absolutePath}." }
}
/**
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/ExternalSloChecker.kt b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/ExternalSloChecker.kt
index 8d4f826f7..8eac05a81 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/ExternalSloChecker.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/ExternalSloChecker.kt
@@ -46,7 +46,7 @@ class ExternalSloChecker(
val result = post(externalSlopeURL, data = data, timeout = TIMEOUT)
if (result.statusCode != 200) {
counter++
- logger.error { "Could not reach external slope analysis" }
+ logger.error { "Could not reach external SLO checker" }
} else {
val booleanResult = result.text.toBoolean()
logger.info { "SLO checker result is: $booleanResult" }
@@ -54,6 +54,6 @@ class ExternalSloChecker(
}
}
- throw ConnectException("Could not reach slope evaluation")
+ throw ConnectException("Could not reach external SLO checker")
}
}
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
index bbfbf8c32..833d7d1e1 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/evaluation/MetricFetcher.kt
@@ -48,18 +48,18 @@ class MetricFetcher(private val prometheusURL: String, private val offset: Durat
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. Retrying now." }
counter++
} else {
val values = parseValues(response)
if (values.data?.result.isNullOrEmpty()) {
- logger.error { "Empty query result: $values between $start and $end for querry $query" }
+ logger.error { "Empty query result: $values between $start and $end for query $query." }
throw NoSuchFieldException()
}
return parseValues(response)
}
}
- throw ConnectException("No answer from Prometheus received")
+ throw ConnectException("No answer from Prometheus received.")
}
/**
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
index e179f7fa9..6d4cd9ea9 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutor.kt
@@ -47,7 +47,7 @@ abstract class BenchmarkExecutor(
*
*/
fun waitAndLog() {
- logger.info { "Execution of a new benchmark started." }
+ logger.info { "Execution of a new experiment started." }
var secondsRunning = 0L
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt
index 1ab8e2152..d088f8d46 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/BenchmarkExecutorImpl.kt
@@ -30,7 +30,7 @@ class BenchmarkExecutorImpl(
benchmarkDeployment.setup()
this.waitAndLog()
} catch (e: Exception) {
- logger.error { "Error while setup experiment." }
+ logger.error { "Error while setting up experiment with id ${this.executionId}." }
logger.error { "Error is: $e" }
this.run.set(false)
}
@@ -51,8 +51,8 @@ class BenchmarkExecutorImpl(
try {
benchmarkDeployment.teardown()
} catch (e: Exception) {
- logger.warn { "Error while teardown of deplyoment" }
- logger.debug { "The Teardowm failed cause of: $e " }
+ logger.warn { "Error while tearing down the benchmark deployment." }
+ logger.debug { "Teardown failed, caused by: $e " }
}
return result
--
GitLab