Fix recursion (#292)

* Fix recursion * Remove metrics from onchain web3
lidofinance · Dec 10, 2024 · f8c3d56 · f8c3d56
1 parent e2694eb
commit f8c3d56
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/blockchain/web3_extentions/middleware.py b/src/blockchain/web3_extentions/middleware.py
@@ -21,7 +21,6 @@ def add_requests_metric_middleware(web3: Web3) -> Web3:
 
     def metrics_collector(make_request: Callable[[RPCEndpoint, Any], RPCResponse], w3: Web3) -> Callable[[RPCEndpoint, Any], RPCResponse]:
         """Constructs a middleware which measure requests parameters"""
-        chain_id = w3.eth.chain_id
 
         def middleware(method: RPCEndpoint, params: Any) -> RPCResponse:
             try:
@@ -33,7 +32,6 @@ def middleware(method: RPCEndpoint, params: Any) -> RPCResponse:
                     method=method,
                     code=failed.status_code,
                     domain=urlparse(web3.provider.endpoint_uri).netloc,  # pyright: ignore
-                    chain_id=chain_id,
                 ).inc()
                 raise
 
@@ -48,7 +46,6 @@ def middleware(method: RPCEndpoint, params: Any) -> RPCResponse:
                 method=method,
                 code=code,
                 domain=urlparse(web3.provider.endpoint_uri).netloc,  # pyright: ignore
-                chain_id=chain_id,
             ).inc()
             return response
 

diff --git a/src/metrics/metrics.py b/src/metrics/metrics.py
@@ -110,7 +110,7 @@
 ETH_RPC_REQUESTS = Counter(
     'eth_rpc_requests',
     'Total count of requests to ETH1 RPC',
-    ['method', 'code', 'domain', 'chain_id'],
+    ['method', 'code', 'domain'],
     namespace=PROMETHEUS_PREFIX,
 )
 

diff --git a/src/transport/msg_providers/onchain_transport.py b/src/transport/msg_providers/onchain_transport.py
@@ -3,7 +3,7 @@
 from typing import Callable, List, Optional
 
 import variables
-from blockchain.web3_extentions.middleware import add_cache_middleware, add_requests_metric_middleware
+from blockchain.web3_extentions.middleware import add_cache_middleware
 from eth_typing import ChecksumAddress
 from eth_utils import to_bytes
 from schema import Schema
@@ -326,4 +326,4 @@ def _parse_log(self, log: LogReceipt) -> Optional[dict]:
 
     @staticmethod
     def create_ochain_transport_w3() -> Web3:
-        return add_requests_metric_middleware(add_cache_middleware(Web3(FallbackProvider(variables.ONCHAIN_TRANSPORT_RPC_ENDPOINTS))))
+        return add_cache_middleware(Web3(FallbackProvider(variables.ONCHAIN_TRANSPORT_RPC_ENDPOINTS)))