feat: clean up max fee per gas tracing instrument and add instrument …

…for estimate uo gas
alchemyplatform · Feb 21, 2025 · d9efab2 · d9efab2
1 parent 32c3990
commit d9efab2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/crates/rpc/src/eth/server.rs b/crates/rpc/src/eth/server.rs
@@ -15,6 +15,7 @@ use alloy_primitives::{Address, B256, U64};
 use jsonrpsee::core::RpcResult;
 use rundler_provider::StateOverride;
 use rundler_types::{pool::Pool, UserOperationVariant};
+use tracing::instrument;
 
 use super::{api::EthApi, EthApiServer};
 use crate::{
@@ -46,6 +47,7 @@ where
         .await
     }
 
+    #[instrument(name = "EthApiServer::estimate_user_operation_gas", skip(self))]
     async fn estimate_user_operation_gas(
         &self,
         op: RpcUserOperationOptionalGas,

diff --git a/crates/rpc/src/rundler.rs b/crates/rpc/src/rundler.rs
@@ -70,11 +70,7 @@ where
     P: Pool + 'static,
     F: FeeEstimator + 'static,
 {
-    #[instrument(
-        name = "RundlerApiServer::max_priority_fee_per_gas",
-        skip(self),
-        fields(force_trace_sample = true)
-    )]
+    #[instrument(name = "RundlerApiServer::max_priority_fee_per_gas", skip(self))]
     async fn max_priority_fee_per_gas(&self) -> RpcResult<U128> {
         utils::safe_call_rpc_handler(
             "rundler_maxPriorityFeePerGas",
@@ -115,8 +111,7 @@ where
         }
     }
 
-    #[instrument(skip(self))]
-    async fn simple_wrapper(&self) -> EthResult<U128> {
+    async fn max_priority_fee_per_gas(&self) -> EthResult<U128> {
         let (bundle_fees, _) = self
             .fee_estimator
             .required_bundle_fees(None)
@@ -129,11 +124,6 @@ where
         ))
     }
 
-    #[instrument(name = "RundlerApi::max_priority_fee_per_gas", skip(self))]
-    async fn max_priority_fee_per_gas(&self) -> EthResult<U128> {
-        self.simple_wrapper().await
-    }
-
     async fn drop_local_user_operation(
         &self,
         user_op: RpcUserOperation,