Call updateMonitoringMetrics following all ApplyLoggingPlugins

lifenjoiner · lifenjoiner · commit ea9728d5934c · 2025-09-25T22:31:09.000+08:00
Keep both results the same.
diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go
@@ -744,6 +744,7 @@ func (proxy *Proxy) processIncomingQuery(
 	if pluginsState.action == PluginsActionDrop {
 		pluginsState.returnCode = PluginsReturnCodeDrop
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+		updateMonitoringMetrics(proxy, &pluginsState)
 		return response
 	}
 
@@ -806,6 +807,7 @@ func (proxy *Proxy) processIncomingQuery(
 			pluginsState.returnCode = PluginsReturnCodeParseError
 		}
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+		updateMonitoringMetrics(proxy, &pluginsState)
 		if serverInfo != nil {
 			serverInfo.noticeFailure(proxy)
 		}
diff --git a/dnscrypt-proxy/query_processing.go b/dnscrypt-proxy/query_processing.go
@@ -54,6 +54,7 @@ func processDNSCryptQuery(
 	if err != nil {
 		pluginsState.returnCode = PluginsReturnCodeParseError
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return nil, err
 	}
 
@@ -75,6 +76,7 @@ func processDNSCryptQuery(
 			if err != nil {
 				pluginsState.returnCode = PluginsReturnCodeParseError
 				pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+				updateMonitoringMetrics(proxy, pluginsState)
 				return nil, err
 			}
 			response, err = proxy.exchangeWithTCPServer(serverInfo, sharedKey, encryptedQuery, clientNonce)
@@ -100,6 +102,7 @@ func processDNSCryptQuery(
 		}
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 		serverInfo.noticeFailure(proxy)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return nil, err
 	}
 
@@ -132,6 +135,7 @@ func processDoHQuery(
 		pluginsState.returnCode = PluginsReturnCodeNetworkError
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 		serverInfo.noticeFailure(proxy)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return nil, err
 	}
 
@@ -207,6 +211,7 @@ func processODoHQuery(
 	pluginsState.returnCode = PluginsReturnCodeNetworkError
 	pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 	serverInfo.noticeFailure(proxy)
+	updateMonitoringMetrics(proxy, pluginsState)
 
 	return nil, err
 }
@@ -240,6 +245,7 @@ func handleDNSExchange(
 		pluginsState.returnCode = PluginsReturnCodeParseError
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 		serverInfo.noticeFailure(proxy)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return nil, err
 	}
 
@@ -261,12 +267,14 @@ func processPlugins(
 		pluginsState.returnCode = PluginsReturnCodeParseError
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
 		serverInfo.noticeFailure(proxy)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return response, err
 	}
 
 	if pluginsState.action == PluginsActionDrop {
 		pluginsState.returnCode = PluginsReturnCodeDrop
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return response, nil
 	}
 
@@ -275,6 +283,7 @@ func processPlugins(
 		if err != nil {
 			pluginsState.returnCode = PluginsReturnCodeParseError
 			pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+			updateMonitoringMetrics(proxy, pluginsState)
 			return response, err
 		}
 	}
@@ -310,6 +319,7 @@ func sendResponse(
 			pluginsState.returnCode = PluginsReturnCodeParseError
 		}
 		pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+		updateMonitoringMetrics(proxy, pluginsState)
 		return
 	}
 
@@ -320,6 +330,7 @@ func sendResponse(
 			if err != nil {
 				pluginsState.returnCode = PluginsReturnCodeParseError
 				pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+				updateMonitoringMetrics(proxy, pluginsState)
 				return
 			}
 		}
@@ -334,6 +345,7 @@ func sendResponse(
 		if err != nil {
 			pluginsState.returnCode = PluginsReturnCodeParseError
 			pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
+			updateMonitoringMetrics(proxy, pluginsState)
 			return
 		}
 		if clientPc != nil {

Original file line number	Diff line number	Diff line change
`@@ -744,6 +744,7 @@ func (proxy *Proxy) processIncomingQuery(`
`744`	`744`	`if pluginsState.action == PluginsActionDrop {`
`745`	`745`	`pluginsState.returnCode = PluginsReturnCodeDrop`
`746`	`746`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`747`	`+ updateMonitoringMetrics(proxy, &pluginsState)`
`747`	`748`	`return response`
`748`	`749`	`}`
`749`	`750`
`@@ -806,6 +807,7 @@ func (proxy *Proxy) processIncomingQuery(`
`806`	`807`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`807`	`808`	`}`
`808`	`809`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`810`	`+ updateMonitoringMetrics(proxy, &pluginsState)`
`809`	`811`	`if serverInfo != nil {`
`810`	`812`	`serverInfo.noticeFailure(proxy)`
`811`	`813`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ func processDNSCryptQuery(`
`54`	`54`	`if err != nil {`
`55`	`55`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`56`	`56`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`57`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`57`	`58`	`return nil, err`
`58`	`59`	`}`
`59`	`60`
`@@ -75,6 +76,7 @@ func processDNSCryptQuery(`
`75`	`76`	`if err != nil {`
`76`	`77`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`77`	`78`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`79`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`78`	`80`	`return nil, err`
`79`	`81`	`}`
`80`	`82`	`response, err = proxy.exchangeWithTCPServer(serverInfo, sharedKey, encryptedQuery, clientNonce)`
`@@ -100,6 +102,7 @@ func processDNSCryptQuery(`
`100`	`102`	`}`
`101`	`103`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
`102`	`104`	`serverInfo.noticeFailure(proxy)`
	`105`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`103`	`106`	`return nil, err`
`104`	`107`	`}`
`105`	`108`
`@@ -132,6 +135,7 @@ func processDoHQuery(`
`132`	`135`	`pluginsState.returnCode = PluginsReturnCodeNetworkError`
`133`	`136`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
`134`	`137`	`serverInfo.noticeFailure(proxy)`
	`138`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`135`	`139`	`return nil, err`
`136`	`140`	`}`
`137`	`141`
`@@ -207,6 +211,7 @@ func processODoHQuery(`
`207`	`211`	`pluginsState.returnCode = PluginsReturnCodeNetworkError`
`208`	`212`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
`209`	`213`	`serverInfo.noticeFailure(proxy)`
	`214`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`210`	`215`
`211`	`216`	`return nil, err`
`212`	`217`	`}`
`@@ -240,6 +245,7 @@ func handleDNSExchange(`
`240`	`245`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`241`	`246`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
`242`	`247`	`serverInfo.noticeFailure(proxy)`
	`248`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`243`	`249`	`return nil, err`
`244`	`250`	`}`
`245`	`251`
`@@ -261,12 +267,14 @@ func processPlugins(`
`261`	`267`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`262`	`268`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
`263`	`269`	`serverInfo.noticeFailure(proxy)`
	`270`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`264`	`271`	`return response, err`
`265`	`272`	`}`
`266`	`273`
`267`	`274`	`if pluginsState.action == PluginsActionDrop {`
`268`	`275`	`pluginsState.returnCode = PluginsReturnCodeDrop`
`269`	`276`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`277`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`270`	`278`	`return response, nil`
`271`	`279`	`}`
`272`	`280`
`@@ -275,6 +283,7 @@ func processPlugins(`
`275`	`283`	`if err != nil {`
`276`	`284`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`277`	`285`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`286`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`278`	`287`	`return response, err`
`279`	`288`	`}`
`280`	`289`	`}`
`@@ -310,6 +319,7 @@ func sendResponse(`
`310`	`319`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`311`	`320`	`}`
`312`	`321`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`322`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`313`	`323`	`return`
`314`	`324`	`}`
`315`	`325`
`@@ -320,6 +330,7 @@ func sendResponse(`
`320`	`330`	`if err != nil {`
`321`	`331`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`322`	`332`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`333`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`323`	`334`	`return`
`324`	`335`	`}`
`325`	`336`	`}`
`@@ -334,6 +345,7 @@ func sendResponse(`
`334`	`345`	`if err != nil {`
`335`	`346`	`pluginsState.returnCode = PluginsReturnCodeParseError`
`336`	`347`	`pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)`
	`348`	`+ updateMonitoringMetrics(proxy, pluginsState)`
`337`	`349`	`return`
`338`	`350`	`}`
`339`	`351`	`if clientPc != nil {`