From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 14 Apr 2025 09:13:32 +0000 (+0200)
Subject: modules/stats: further improve latency measurements
X-Git-Tag: v5.7.5~3^2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-back-g3r3cl%2Fdeployments%2F6641;p=thirdparty%2Fknot-resolver.git

modules/stats: further improve latency measurements

libuv's updating the stamp just once per event loop
might be too coarse, as processing multiple packets
(e.g. DNSSEC validation) may take milliseconds together.

Of course we still don't measure e.g. the time when incoming
client requests stay in OS buffers.

(cherry picked from commit 5e6a02b3902ac98b327eca281ae70fa2bb9a9598)
---

diff --git a/NEWS b/NEWS
index efe74baae..4b17d8b5b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ Improvements
 - tests: disable problematic config.http test (#925, !1678)
 - validator: accept a confusing NODATA proof with insecure delegation (!1678)
 
+Bugfixes
+--------
+- stats: request latency was very incorrect in some cases (!1678)
+
 
 Knot Resolver 5.7.4 (2024-07-23)
 ================================
diff --git a/lib/rplan.c b/lib/rplan.c
index 0bedd8a73..3d56e2bf4 100644
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -157,6 +157,8 @@ static struct kr_query *kr_rplan_push_query(struct kr_rplan *rplan,
 	qry->request = rplan->request;
 
 	gettimeofday(&qry->timestamp, NULL);
+	if (!parent)  // start of kr_request; let's make the stamp more precise
+		uv_update_time(uv_default_loop());
 	qry->timestamp_mono = kr_now();
 	qry->creation_time_mono = parent ? parent->creation_time_mono : qry->timestamp_mono;
 	kr_zonecut_init(&qry->zone_cut, (const uint8_t *)"", rplan->pool);
diff --git a/modules/stats/stats.c b/modules/stats/stats.c
index 3b57c57b1..074f7e534 100644
--- a/modules/stats/stats.c
+++ b/modules/stats/stats.c
@@ -248,8 +248,14 @@ static int collect(kr_layer_t *ctx)
 	collect_answer(data, param->answer);
 	/* Count cached and unresolved */
 	if (rplan->resolved.len > 0) {
-		/* Histogram of answer latency. */
+		/* Histogram of answer latency.
+		 *
+		 * We update the notion of time.  Once per .finish isn't that expensive.
+		 * defer_* also updates this if active, but not in ideal moment for stats.
+		 */
+		uv_update_time(uv_default_loop());
 		uint64_t elapsed = kr_now() - rplan->initial->creation_time_mono;
+
 		stat_const_add(data, metric_answer_sum_ms, elapsed);
 		if (elapsed <= 1) {
 			stat_const_add(data, metric_answer_1ms, 1);