Merge pull request #4715 from stacks-network/chore/master-to-2.5.0.0.0

Merge master into release/2.5.0.0.0

Author: obycode

stackslib/src/monitoring/mod.rs

@@ -29,6 +29,7 @@ use stacks_common::util::uint::{Uint256, Uint512};
 use crate::burnchains::{BurnchainSigner, Txid};
 use crate::core::MemPoolDB;
 use crate::net::httpcore::{StacksHttpRequest, StacksHttpResponse};
+use crate::net::rpc::ConversationHttp;
 use crate::net::Error as net_error;
 use crate::util_lib::db::{sqlite_open, tx_busy_handler, DBConn, Error as DatabaseError};
 
@@ -46,19 +47,20 @@ pub fn increment_rpc_calls_counter() {
 }
 
 pub fn instrument_http_request_handler<F, R>(
-    req: StacksHttpRequest,
+    conv_http: &mut ConversationHttp,
+    mut req: StacksHttpRequest,
     handler: F,
 ) -> Result<R, net_error>
 where
-    F: FnOnce(StacksHttpRequest) -> Result<R, net_error>,
+    F: FnOnce(&mut ConversationHttp, StacksHttpRequest) -> Result<R, net_error>,
 {
     #[cfg(feature = "monitoring_prom")]
     increment_rpc_calls_counter();
 
     #[cfg(feature = "monitoring_prom")]
-    let timer = prometheus::new_rpc_call_timer(req.request_path());
+    let timer = prometheus::new_rpc_call_timer(conv_http.metrics_identifier(&mut req));
 
-    let res = handler(req);
+    let res = handler(conv_http, req);
 
     #[cfg(feature = "monitoring_prom")]
     timer.stop_and_record();

stackslib/src/net/api/callreadonly.rs

@@ -116,6 +116,10 @@ impl HttpRequest for RPCCallReadOnlyRequestHandler {
         .unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/contracts/call-read/:principal/:contract_name/:func_name"
+    }
+
     /// Try to decode this request.
     fn try_parse_request(
         &mut self,

stackslib/src/net/api/getaccount.rs

@@ -84,6 +84,10 @@ impl HttpRequest for RPCGetAccountRequestHandler {
         .unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/accounts/:principal"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getattachment.rs

@@ -59,6 +59,10 @@ impl HttpRequest for RPCGetAttachmentRequestHandler {
         Regex::new(r#"^/v2/attachments/(?P<attachment_hash>[0-9a-f]{40})$"#).unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/attachments/:hash"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getattachmentsinv.rs

@@ -61,6 +61,10 @@ impl HttpRequest for RPCGetAttachmentsInvRequestHandler {
         Regex::new("^/v2/attachments/inv$").unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/attachments/inv"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getblock.rs

@@ -90,6 +90,10 @@ impl HttpRequest for RPCBlocksRequestHandler {
         Regex::new(r#"^/v2/blocks/(?P<block_id>[0-9a-f]{64})$"#).unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/blocks/:block_id"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getblock_v3.rs

@@ -126,6 +126,10 @@ impl HttpRequest for RPCNakamotoBlockRequestHandler {
         Regex::new(r#"^/v3/blocks/(?P<block_id>[0-9a-f]{64})$"#).unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v3/blocks/:block_id"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getconstantval.rs

@@ -83,6 +83,10 @@ impl HttpRequest for RPCGetConstantValRequestHandler {
         .unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/constant_val/:principal/:contract_name/:const_name"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getcontractabi.rs

@@ -78,6 +78,10 @@ impl HttpRequest for RPCGetContractAbiRequestHandler {
         .unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/contracts/interface/:principal/:contract_name"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(

stackslib/src/net/api/getcontractsrc.rs

@@ -86,6 +86,10 @@ impl HttpRequest for RPCGetContractSrcRequestHandler {
         .unwrap()
     }
 
+    fn metrics_identifier(&self) -> &str {
+        "/v2/contracts/source/:principal/:contract_name"
+    }
+
     /// Try to decode this request.
     /// There's nothing to load here, so just make sure the request is well-formed.
     fn try_parse_request(