all: upd chlog

AdguardTeam · Oct 31, 2023 · 4d7431c · 4d7431c
1 parent 040b6b9
commit 4d7431c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,13 +30,15 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
+- Average request processing time calculation ([#6220]).
 - `$important,dnsrewrite` rules do not take precedence over allowlist rules
   ([#6204]).
 - Dark mode DNS rewrite background ([#6329]).
 - Issues with QUIC and HTTP/3 upstreams on Linux ([#6335]).
 
 [#4977]: https://github.com/AdguardTeam/AdGuardHome/issues/4977
 [#6204]: https://github.com/AdguardTeam/AdGuardHome/issues/6204
+[#6220]: https://github.com/AdguardTeam/AdGuardHome/issues/6220
 [#6329]: https://github.com/AdguardTeam/AdGuardHome/issues/6329
 [#6335]: https://github.com/AdguardTeam/AdGuardHome/issues/6335
 

diff --git a/internal/dnsforward/stats.go b/internal/dnsforward/stats.go
@@ -21,8 +21,6 @@ func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
 	defer log.Debug("dnsforward: finished processing querylog and stats")
 
 	pctx := dctx.proxyCtx
-	elapsed := pctx.QueryDuration
-
 	q := pctx.Req.Question[0]
 	host := aghnet.NormalizeDomain(q.Name)
 
@@ -43,7 +41,7 @@ func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
 	defer s.serverLock.RUnlock()
 
 	if s.shouldLog(host, qt, cl, ids) {
-		s.logQuery(dctx, pctx, elapsed, ip)
+		s.logQuery(dctx, ip)
 	} else {
 		log.Debug(
 			"dnsforward: request %s %s %q from %s ignored; not adding to querylog",
@@ -55,7 +53,7 @@ func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) {
 	}
 
 	if s.shouldCountStat(host, qt, cl, ids) {
-		s.updateStats(dctx, elapsed, *dctx.result, ipStr)
+		s.updateStats(dctx, ipStr)
 	} else {
 		log.Debug(
 			"dnsforward: request %s %s %q from %s ignored; not counting in stats",
@@ -90,12 +88,9 @@ func (s *Server) shouldCountStat(host string, qt, cl uint16, ids []string) (ok b
 }
 
 // logQuery pushes the request details into the query log.
-func (s *Server) logQuery(
-	dctx *dnsContext,
-	pctx *proxy.DNSContext,
-	elapsed time.Duration,
-	ip net.IP,
-) {
+func (s *Server) logQuery(dctx *dnsContext, ip net.IP) {
+	pctx := dctx.proxyCtx
+
 	p := &querylog.AddParams{
 		Question:          pctx.Req,
 		ReqECS:            pctx.ReqECS,
@@ -104,7 +99,7 @@ func (s *Server) logQuery(
 		Result:            dctx.result,
 		ClientID:          dctx.clientID,
 		ClientIP:          ip,
-		Elapsed:           elapsed,
+		Elapsed:           time.Since(dctx.startTime),
 		AuthenticatedData: dctx.responseAD,
 	}
 
@@ -132,30 +127,26 @@ func (s *Server) logQuery(
 }
 
 // updatesStats writes the request into statistics.
-func (s *Server) updateStats(
-	ctx *dnsContext,
-	elapsed time.Duration,
-	res filtering.Result,
-	clientIP string,
-) {
-	pctx := ctx.proxyCtx
+func (s *Server) updateStats(dctx *dnsContext, clientIP string) {
+	pctx := dctx.proxyCtx
+
 	e := &stats.Entry{
 		Domain: aghnet.NormalizeDomain(pctx.Req.Question[0].Name),
 		Result: stats.RNotFiltered,
-		Time:   elapsed,
+		Time:   pctx.QueryDuration,
 	}
 
 	if pctx.Upstream != nil {
 		e.Upstream = pctx.Upstream.Address()
 	}
 
-	if clientID := ctx.clientID; clientID != "" {
+	if clientID := dctx.clientID; clientID != "" {
 		e.Client = clientID
 	} else {
 		e.Client = clientIP
 	}
 
-	switch res.Reason {
+	switch dctx.result.Reason {
 	case filtering.FilteredSafeBrowsing:
 		e.Result = stats.RSafeBrowsing
 	case filtering.FilteredParental:

diff --git a/internal/stats/unit.go b/internal/stats/unit.go
@@ -604,12 +604,11 @@ func prepareTopUpstreamsAvgTime(
 ) (topUpstreamsAvgTime []topAddrsFloat) {
 	keys := maps.Keys(upstreamsAvgTime)
 
-	// Sort in ascending order.
 	slices.SortFunc(keys, func(a, b string) (res int) {
 		switch x, y := upstreamsAvgTime[a], upstreamsAvgTime[b]; {
-		case x < y:
-			return -1
 		case x > y:
+			return -1
+		case x < y:
 			return +1
 		default:
 			return 0

diff --git a/internal/stats/unit_internal_test.go b/internal/stats/unit_internal_test.go
@@ -160,10 +160,10 @@ func TestTopUpstreamsPairs(t *testing.T) {
 			{"1.1.1.1": 2},
 		},
 		wantAvgTime: []topAddrsFloat{
-			{"1.1.1.1": 1},
-			{"2.2.2.2": 10},
-			{"3.3.3.3": 100},
 			{"4.4.4.4": 1000},
+			{"3.3.3.3": 100},
+			{"2.2.2.2": 10},
+			{"1.1.1.1": 1},
 		},
 	}}