Rethrow errors in overridden send provider method

cerc-io · May 15, 2024 · 0baafcd · 0baafcd
1 parent 41183f1
commit 0baafcd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/packages/util/src/metrics.ts b/packages/util/src/metrics.ts
@@ -100,14 +100,19 @@ export const ethRpcErrors = new client.Counter({
   help: 'Number of ETH RPC request errors',
   labelNames: ['method', 'provider']
 });
-ethRpcErrors.reset();
 
 export const ethRpcRequestDuration = new client.Gauge({
   name: 'watcher_eth_rpc_request_duration',
   help: 'ETH RPC request duration (in seconds)',
   labelNames: ['method', 'provider']
 });
 
+const upstreamEndpointsMetric = new client.Gauge({
+  name: 'watcher_config_upstream_endpoints',
+  help: 'Configured upstream ETH RPC endpoints',
+  labelNames: ['provider']
+});
+
 // Export metrics on a server
 const app: Application = express();
 
@@ -159,6 +164,13 @@ export const startMetricsServer = async (config: Config, indexer: IndexerInterfa
   });
 };
 
+export const setActiveUpstreamEndpointMetric = ({ upstream }: Config, currentEndpointIndex: number): void => {
+  const endpoints = upstream.ethServer.rpcProviderEndpoints;
+  endpoints.forEach((endpoint, index) => {
+    upstreamEndpointsMetric.set({ provider: endpoint }, Number(index === currentEndpointIndex));
+  });
+};
+
 const registerDBSizeMetrics = async ({ database, jobQueue }: Config): Promise<void> => {
   const [watcherConn, jobQueueConn] = await Promise.all([
     createConnection({
@@ -234,16 +246,3 @@ const registerWatcherConfigMetrics = async ({ server, upstream, jobQueue }: Conf
   watcherConfigMetric.set({ category: 'jobqueue', field: 'historical_logs_block_range' }, Number(jobQueue.historicalLogsBlockRange));
   watcherConfigMetric.set({ category: 'jobqueue', field: 'historical_max_fetch_ahead' }, Number(jobQueue.historicalMaxFetchAhead));
 };
-
-const upstreamEndpointsMetric = new client.Gauge({
-  name: 'watcher_config_upstream_endpoints',
-  help: 'Configured upstream ETH RPC endpoints',
-  labelNames: ['provider']
-});
-
-export const setActiveUpstreamEndpointMetric = ({ upstream }: Config, currentEndpointIndex: number): void => {
-  const endpoints = upstream.ethServer.rpcProviderEndpoints;
-  endpoints.forEach((endpoint, index) => {
-    upstreamEndpointsMetric.set({ provider: endpoint }, Number(index === currentEndpointIndex));
-  });
-};
diff --git a/packages/util/src/misc.ts b/packages/util/src/misc.ts
@@ -369,7 +369,7 @@ export class MonitoredStaticJsonRpcProvider extends providers.StaticJsonRpcProvi
       // Ignore errors on fetching future blocks and if block is null (in case of filecoin)
       if (err.code === ethersErrors.SERVER_ERROR && err.error) {
         if (err.error.message === FUTURE_BLOCK_ERROR || err.error.message === NULL_BLOCK_ERROR) {
-          return;
+          throw err;
         }
       }