More fixes for prometheus counters

jedisct1 · jedisct1 · commit 6950ead57d4f · 2025-06-29T16:59:26.000+02:00
diff --git a/dnscrypt-proxy/monitoring_ui.go b/dnscrypt-proxy/monitoring_ui.go
@@ -287,9 +287,13 @@ func (ui *MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg *dns.Msg) {
 	}
 
 	// Update blocked queries count
-	if pluginsState.returnCode == PluginsReturnCodeReject {
+	// Count all types of blocked queries: REJECT (blocked by name/IP), DROP (dropped), and CLOAK (cloaked)
+	if pluginsState.returnCode == PluginsReturnCodeReject ||
+		pluginsState.returnCode == PluginsReturnCodeDrop ||
+		pluginsState.returnCode == PluginsReturnCodeCloak {
 		mc.blockCount++
-		dlog.Debugf("Blocked query, total blocks: %d", mc.blockCount)
+		dlog.Debugf("Blocked query (return code: %s), total blocks: %d",
+			PluginsReturnCodeToString[pluginsState.returnCode], mc.blockCount)
 	}
 	mc.countersMutex.Unlock()
 

Original file line number	Diff line number	Diff line change
`@@ -287,9 +287,13 @@ func (ui MonitoringUI) UpdateMetrics(pluginsState PluginsState, msg dns.Msg) {`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`// Update blocked queries count`
`290`		`- if pluginsState.returnCode == PluginsReturnCodeReject {`
	`290`	`+ // Count all types of blocked queries: REJECT (blocked by name/IP), DROP (dropped), and CLOAK (cloaked)`
	`291`	`+ if pluginsState.returnCode == PluginsReturnCodeReject \|\|`
	`292`	`+ pluginsState.returnCode == PluginsReturnCodeDrop \|\|`
	`293`	`+ pluginsState.returnCode == PluginsReturnCodeCloak {`
`291`	`294`	`mc.blockCount++`
`292`		`- dlog.Debugf("Blocked query, total blocks: %d", mc.blockCount)`
	`295`	`+ dlog.Debugf("Blocked query (return code: %s), total blocks: %d",`
	`296`	`+ PluginsReturnCodeToString[pluginsState.returnCode], mc.blockCount)`
`293`	`297`	`}`
`294`	`298`	`mc.countersMutex.Unlock()`
`295`	`299`