Centralize incoming request logging in monitoring

Move the log_incoming_request helper from proxy/service.rs into monitoring/service.rs and call it at the start of NodeService::handle_request. Remove the duplicate implementation and the call from ProxyRequestService. Also add user_agent to an existing log entry in monitoring/service.rs. This centralizes request logging (including RPC method details for JsonRpc requests) and removes redundant code in the proxy service.

Author: gemcoder21

core/apps/dynode/src/monitoring/service.rs

@@ -101,6 +101,8 @@ impl NodeService {
     }
 
     pub async fn handle_request(&self, request: ProxyRequest) -> Result<ProxyResponse, Box<dyn Error + Send + Sync>> {
+        Self::log_incoming_request(&request);
+
         let chain_config = self.get_chain_config(&request)?;
         if !self.chain_types.allows(chain_config, request.request_type()) {
             return Self::request_not_allowed_response(&request);
@@ -180,6 +182,34 @@ impl NodeService {
         self.log_and_create_error_response(&request, None, UPSTREAMS_FAILED, last_error_data)
     }
 
+    fn log_incoming_request(request: &ProxyRequest) {
+        let request_type = request.request_type();
+
+        match request_type {
+            RequestType::JsonRpc(_) => {
+                info_with_fields!(
+                    "Incoming request",
+                    id = request.id.as_str(),
+                    chain = request.chain.as_ref(),
+                    method = request.method.as_str(),
+                    uri = request.path.as_str(),
+                    rpc_method = &request_type.get_methods_list(),
+                    user_agent = request.user_agent.as_str(),
+                );
+            }
+            RequestType::Regular { .. } => {
+                info_with_fields!(
+                    "Incoming request",
+                    id = request.id.as_str(),
+                    chain = request.chain.as_ref(),
+                    method = request.method.as_str(),
+                    uri = request.path.as_str(),
+                    user_agent = request.user_agent.as_str(),
+                );
+            }
+        }
+    }
+
     fn get_chain_config(&self, request: &ProxyRequest) -> Result<&ChainConfig, Box<dyn Error + Send + Sync>> {
         self.chains.get(&request.chain).ok_or_else(|| format!("Chain {} not configured", request.chain).into())
     }
@@ -207,6 +237,7 @@ impl NodeService {
             chain = request.chain.as_ref(),
             method = request.method.as_str(),
             uri = request.path.as_str(),
+            user_agent = request.user_agent.as_str(),
             request = &request.request_type().get_methods_list(),
         );
 

core/apps/dynode/src/proxy/service.rs

@@ -97,31 +97,6 @@ impl ProxyRequestService {
         headers
     }
 
-    fn log_incoming_request(request: &ProxyRequest, request_type: &RequestType) {
-        let request_id = request.id.as_str();
-        let chain = request.chain.as_ref();
-        let method = request.method.as_str();
-        let uri = request.path.as_str();
-        let user_agent = request.user_agent.as_str();
-
-        match request_type {
-            RequestType::JsonRpc(_) => {
-                info_with_fields!(
-                    "Incoming request",
-                    id = request_id,
-                    chain = chain,
-                    method = method,
-                    uri = uri,
-                    rpc_method = &request_type.get_methods_list(),
-                    user_agent = user_agent,
-                );
-            }
-            RequestType::Regular { .. } => {
-                info_with_fields!("Incoming request", id = request_id, chain = chain, method = method, uri = uri, user_agent = user_agent,);
-            }
-        }
-    }
-
     fn add_proxy_response_metrics(metrics: &Metrics, request: &ProxyRequest, methods_for_metrics: &[String], host: &str, status: u16) {
         for method_name in methods_for_metrics {
             metrics.add_proxy_response(request.chain.as_ref(), method_name, host, status, request.elapsed().as_millis());
@@ -143,8 +118,6 @@ impl ProxyRequestService {
 
         self.metrics.add_proxy_request(request.chain.as_ref());
 
-        Self::log_incoming_request(&request, request_type);
-
         let cache_ttl = self.cache.should_cache_request(&chain, request_type);
         let cache_key = cache_ttl.and_then(|_| request_type.cache_key(&request.host, &request.path_with_query));
         let inflight_key = self