envio 3.3.0-alpha.7 → 3.3.0-alpha.9

package/src/sources/RpcSource.res.mjs

@@ -9,7 +9,6 @@ import * as Address from "../Address.res.mjs";
 import * as Logging from "../Logging.res.mjs";
 import * as Internal from "../Internal.res.mjs";
 import * as LazyLoader from "../LazyLoader.res.mjs";
-import * as Prometheus from "../Prometheus.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as EventRouter from "./EventRouter.res.mjs";
 import * as Performance from "../bindings/Performance.res.mjs";
@@ -47,11 +46,11 @@ function parseBlockInfo(json) {
   };
 }
 
-async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumber, backoffMsOnFailure) {
+async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumber, backoffMsOnFailure, recordRequest) {
   let currentBackoff = backoffMsOnFailure;
   let result;
   while (Stdlib_Option.isNone(result)) {
-    Prometheus.SourceRequestCount.increment(sourceName, chain, "eth_getBlockByNumber");
+    let timerRef = Performance.now();
     let exit = 0;
     let json;
     try {
@@ -59,6 +58,7 @@ async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumbe
       exit = 1;
     } catch (raw_err) {
       let err = Primitive_exceptions.internalToException(raw_err);
+      recordRequest("eth_getBlockByNumber", Performance.secondsSince(timerRef));
       Logging.warn({
         err: Utils.prettifyExn(err),
         msg: `Issue while running fetching batch of events from the RPC. Will wait ` + currentBackoff.toString() + `ms and try again.`,
@@ -70,6 +70,7 @@ async function getKnownRawBlockWithBackoff(client, sourceName, chain, blockNumbe
       currentBackoff = (currentBackoff << 1);
     }
     if (exit === 1) {
+      recordRequest("eth_getBlockByNumber", Performance.secondsSince(timerRef));
       result = json;
     }
   };
@@ -265,14 +266,14 @@ function mergeAndDedupItems(itemsPerSelection) {
   return merged;
 }
 
-function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient, mutSuggestedBlockIntervals, partitionId, sourceName, chainId) {
+function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient, mutSuggestedBlockIntervals, partitionId, recordRequest) {
   let queryTimoutPromise = Time.resolvePromiseAfterDelay(sc.queryTimeoutMillis).then(() => Promise.reject({
     RE_EXN_ID: QueryTimout,
     _1: `Query took longer than ` + (sc.queryTimeoutMillis / 1000 | 0).toString() + ` seconds`
   }));
   let latestFetchedBlockPromise = loadBlock(toBlock);
   let queryLogs = param => {
-    Prometheus.SourceRequestCount.increment(sourceName, chainId, "eth_getLogs");
+    let timerRef = Performance.now();
     return rpcClient.getLogs({
       fromBlock: fromBlock,
       toBlock: toBlock,
@@ -286,6 +287,9 @@ function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient
           return filter;
         }
       })
+    }).then(items => {
+      recordRequest("eth_getLogs", Performance.secondsSince(timerRef));
+      return items;
     });
   };
   let len = logSelections.length;
@@ -352,9 +356,9 @@ function getNextPage(fromBlock, toBlock, logSelections, loadBlock, sc, rpcClient
   });
 }
 
-function getSelectionConfig(selection, chain) {
-  let evmEventConfigs = selection.eventConfigs;
-  if (Utils.$$Array.isEmpty(evmEventConfigs)) {
+function getSelectionConfig(selection) {
+  let evmOnEventRegistrations = selection.onEventRegistrations;
+  if (Utils.$$Array.isEmpty(evmOnEventRegistrations)) {
     throw {
       RE_EXN_ID: Source.GetItemsError,
       _1: {
@@ -365,24 +369,19 @@ function getSelectionConfig(selection, chain) {
     };
   }
   let noAddressTopicSelections = [];
-  let staticByContract = {};
-  let dynamicByContract = {};
-  let dynamicWildcardByContract = {};
+  let byContract = {};
+  let wildcardByContract = {};
   let contractNames = new Set();
-  evmEventConfigs.forEach(param => {
-    let contractName = param.contractName;
-    let eventFilters = param.getEventFiltersOrThrow(chain);
-    if (param.dependsOnAddresses) {
+  evmOnEventRegistrations.forEach(reg => {
+    let contractName = reg.eventConfig.contractName;
+    let resolvedWhere = reg.resolvedWhere;
+    if (reg.dependsOnAddresses) {
       contractNames.add(contractName);
-      if (eventFilters.TAG === "Static") {
-        return Utils.Dict.pushMany(staticByContract, contractName, eventFilters._0);
-      } else {
-        return Utils.Dict.push(param.isWildcard ? dynamicWildcardByContract : dynamicByContract, contractName, eventFilters._0);
-      }
+      return Utils.Dict.pushMany(reg.isWildcard ? wildcardByContract : byContract, contractName, resolvedWhere.topicSelections);
+    } else {
+      noAddressTopicSelections.push(...LogSelection.materializeTopicSelections(resolvedWhere.topicSelections, []));
+      return;
     }
-    let tmp;
-    tmp = eventFilters.TAG === "Static" ? eventFilters._0 : eventFilters._0([]);
-    noAddressTopicSelections.push(...tmp);
   });
   let toLogSelections = (addresses, topicSelections) => LogSelection.compressTopicSelections(topicSelections).map(topicSelection => ({
     addresses: addresses,
@@ -399,21 +398,13 @@ function getSelectionConfig(selection, chain) {
         if (addresses.length === 0) {
           return;
         }
-        let addressedTopicSelections = [];
-        let s = staticByContract[contractName];
-        if (s !== undefined) {
-          addressedTopicSelections.push(...s);
-        }
-        let fns = dynamicByContract[contractName];
-        if (fns !== undefined) {
-          fns.forEach(fn => {
-            addressedTopicSelections.push(...fn(addresses));
-          });
+        let topicSelections = byContract[contractName];
+        if (topicSelections !== undefined) {
+          logSelections.push(...toLogSelections(addresses, LogSelection.materializeTopicSelections(topicSelections, addresses)));
         }
-        logSelections.push(...toLogSelections(addresses, addressedTopicSelections));
-        let fns$1 = dynamicWildcardByContract[contractName];
-        if (fns$1 !== undefined) {
-          logSelections.push(...toLogSelections(undefined, fns$1.flatMap(fn => fn(addresses))));
+        let topicSelections$1 = wildcardByContract[contractName];
+        if (topicSelections$1 !== undefined) {
+          logSelections.push(...toLogSelections(undefined, LogSelection.materializeTopicSelections(topicSelections$1, addresses)));
           return;
         }
       });
@@ -424,8 +415,8 @@ function getSelectionConfig(selection, chain) {
   };
 }
 
-function memoGetSelectionConfig(chain) {
-  return Utils.$$WeakMap.memoize(selection => getSelectionConfig(selection, chain));
+function memoGetSelectionConfig() {
+  return Utils.$$WeakMap.memoize(getSelectionConfig);
 }
 
 let lowercaseAddressSchema = S$RescriptSchema.transform(S$RescriptSchema.string, param => ({
@@ -969,13 +960,28 @@ function make(param) {
   let host = Utils.Url.getHostFromUrl(url);
   let urlHost = host !== undefined ? host : Stdlib_JsError.throwWithMessage(`The RPC url for chain ` + chain.toString() + ` is in incorrect format. The RPC url needs to start with either http:// or https://`);
   let name = `RPC (` + urlHost + `)`;
-  let getSelectionConfig = memoGetSelectionConfig(chain);
+  let getSelectionConfig$1 = Utils.$$WeakMap.memoize(getSelectionConfig);
   let mutSuggestedBlockIntervals = {};
   let client = Rpc.makeClient(url, headers);
   let rpcClient = EvmRpcClient.make(url, !lowercaseAddresses, undefined, headers, param.allEventParams);
+  let pendingRequestStats = [];
+  let recordRequest = (method, seconds) => {
+    pendingRequestStats.push({
+      method: method,
+      seconds: seconds
+    });
+  };
+  let drainRequestStats = () => {
+    let stats = pendingRequestStats.slice();
+    Utils.$$Array.clearInPlace(pendingRequestStats);
+    return stats;
+  };
   let makeTransactionLoader = () => LazyLoader.make(transactionHash => {
-    Prometheus.SourceRequestCount.increment(name, chain, "eth_getTransactionByHash");
-    return Rest.fetch(Rpc.GetTransactionByHash.rawRoute, transactionHash, client);
+    let timerRef = Performance.now();
+    return Rest.fetch(Rpc.GetTransactionByHash.rawRoute, transactionHash, client).then(res => {
+      recordRequest("eth_getTransactionByHash", Performance.secondsSince(timerRef));
+      return res;
+    });
   }, (am, exn) => Logging.error({
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
@@ -986,7 +992,7 @@ function make(param) {
       suggestedFix: "This likely means the RPC url you are using is not responding correctly. Please try another RPC endipoint."
     }
   }), undefined, undefined, undefined, undefined);
-  let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chain, blockNumber, 1000), (am, exn) => Logging.error({
+  let makeBlockLoader = () => LazyLoader.make(blockNumber => getKnownRawBlockWithBackoff(client, name, chain, blockNumber, 1000, recordRequest), (am, exn) => Logging.error({
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
     source: name,
@@ -997,8 +1003,11 @@ function make(param) {
     }
   }), undefined, undefined, undefined, undefined);
   let makeReceiptLoader = () => LazyLoader.make(transactionHash => {
-    Prometheus.SourceRequestCount.increment(name, chain, "eth_getTransactionReceipt");
-    return Rest.fetch(Rpc.GetTransactionReceipt.rawRoute, transactionHash, client);
+    let timerRef = Performance.now();
+    return Rest.fetch(Rpc.GetTransactionReceipt.rawRoute, transactionHash, client).then(res => {
+      recordRequest("eth_getTransactionReceipt", Performance.secondsSince(timerRef));
+      return res;
+    });
   }, (am, exn) => Logging.error({
     err: Utils.prettifyExn(exn),
     msg: `Top level promise timeout reached. Please review other errors or warnings in the code. This function will retry in ` + (am._retryDelayMillis / 1000 | 0).toString() + ` seconds. It is highly likely that your indexer isn't syncing on one or more chains currently. Also take a look at the "suggestedFix" in the metadata of this command`,
@@ -1047,9 +1056,9 @@ function make(param) {
     let toBlock$1 = toBlock !== undefined ? Primitive_int.min(toBlock, knownHeight) : knownHeight;
     let suggestedToBlock = Primitive_int.max(Primitive_int.min((fromBlock + suggestedBlockInterval | 0) - 1 | 0, toBlock$1), fromBlock);
     let firstBlockParentPromise = fromBlock > 0 ? LazyLoader.get(blockLoader.contents, fromBlock - 1 | 0).then(json => parseBlockInfo(json)) : Promise.resolve(undefined);
-    let match = getSelectionConfig(selection);
+    let match = getSelectionConfig$1(selection);
     let logSelections = match.getLogSelectionsOrThrow(addressesByContractName);
-    let match$1 = await getNextPage(fromBlock, suggestedToBlock, logSelections, blockNumber => LazyLoader.get(blockLoader.contents, blockNumber).then(parseBlockInfo), syncConfig, rpcClient, mutSuggestedBlockIntervals, partitionId, name, chain);
+    let match$1 = await getNextPage(fromBlock, suggestedToBlock, logSelections, blockNumber => LazyLoader.get(blockLoader.contents, blockNumber).then(parseBlockInfo), syncConfig, rpcClient, mutSuggestedBlockIntervals, partitionId, recordRequest);
     let latestFetchedBlockInfo = match$1.latestFetchedBlockInfo;
     let items = match$1.items;
     let executedBlockInterval = (suggestedToBlock - fromBlock | 0) + 1 | 0;
@@ -1060,10 +1069,11 @@ function make(param) {
       let log = param.log;
       let topic0 = Stdlib_Option.getOr(log.topics[0], "0x0");
       let routedAddress = lowercaseAddresses ? Address.Evm.fromAddressLowercaseOrThrow(log.address) : Address.Evm.fromAddressOrThrow(log.address);
-      let eventConfig = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, contractNameByAddress);
-      if (eventConfig === undefined) {
+      let onEventRegistration = EventRouter.get(eventRouter, EventRouter.getEvmEventId(topic0, log.topics.length), routedAddress, contractNameByAddress);
+      if (onEventRegistration === undefined) {
         return;
       }
+      let eventConfig = onEventRegistration.eventConfig;
       let decoded = Stdlib_Option.flatMap(Primitive_option.fromNullable(param.params), __x => __x[eventConfig.contractName]);
       if (decoded === undefined) {
         return;
@@ -1110,11 +1120,9 @@ function make(param) {
         let block = match[0];
         return {
           kind: 0,
-          eventConfig: eventConfig,
-          timestamp: block.timestamp,
+          onEventRegistration: onEventRegistration,
           chain: chain,
           blockNumber: block.number,
-          blockHash: block.hash,
           logIndex: log.logIndex,
           transactionIndex: log.transactionIndex,
           payload: {
@@ -1125,7 +1133,7 @@ function make(param) {
             srcAddress: routedAddress,
             logIndex: log.logIndex,
             transaction: Primitive_option.some(match[1]),
-            block: block
+            block: Primitive_option.some(block)
           }
         };
       })();
@@ -1162,12 +1170,14 @@ function make(param) {
       blockHashes: blockHashes,
       parsedQueueItems: parsedQueueItems,
       transactionStore: undefined,
+      blockStore: undefined,
       fromBlockQueried: fromBlock,
       latestFetchedBlockNumber: latestFetchedBlockInfo.number,
       latestFetchedBlockTimestamp: latestFetchedBlockInfo.timestamp,
       stats: {
         "total time elapsed (s)": totalTimeElapsed
-      }
+      },
+      requestStats: drainRequestStats()
     };
   };
   let onReorg = param => {
@@ -1175,19 +1185,28 @@ function make(param) {
     transactionLoader.contents = makeTransactionLoader();
     receiptLoader.contents = makeReceiptLoader();
   };
-  let getBlockHashes = (blockNumbers, _currentlyUnusedLogger) => Stdlib_Promise.$$catch(Promise.all(blockNumbers.map(blockNum => LazyLoader.get(blockLoader.contents, blockNum))).then(rawBlocks => ({
-    TAG: "Ok",
-    _0: rawBlocks.map(json => {
-      let b = parseBlockInfo(json);
-      return {
-        blockHash: b.hash,
-        blockNumber: b.number,
-        blockTimestamp: b.timestamp
-      };
-    })
-  })), exn => Promise.resolve({
-    TAG: "Error",
-    _0: exn
+  let getBlockHashes = (blockNumbers, _currentlyUnusedLogger) => Stdlib_Promise.$$catch(Promise.all(blockNumbers.map(blockNum => LazyLoader.get(blockLoader.contents, blockNum))).then(rawBlocks => {
+    let result = {
+      TAG: "Ok",
+      _0: rawBlocks.map(json => {
+        let b = parseBlockInfo(json);
+        return {
+          blockHash: b.hash,
+          blockNumber: b.number,
+          blockTimestamp: b.timestamp
+        };
+      })
+    };
+    return {
+      result: result,
+      requestStats: drainRequestStats()
+    };
+  }), exn => Promise.resolve({
+    result: {
+      TAG: "Error",
+      _0: exn
+    },
+    requestStats: drainRequestStats()
   }));
   let createHeightSubscription = Stdlib_Option.map(param.ws, wsUrl => (onHeight => RpcWebSocketHeightStream.subscribe(wsUrl, chain, onHeight)));
   return {
@@ -1203,15 +1222,14 @@ function make(param) {
       try {
         height = await rpcClient.getHeight();
       } catch (exn) {
-        let seconds = Performance.secondsSince(timerRef);
-        Prometheus.SourceRequestCount.increment(name, chain, "eth_blockNumber");
-        Prometheus.SourceRequestCount.addSeconds(name, chain, "eth_blockNumber", seconds);
+        recordRequest("eth_blockNumber", Performance.secondsSince(timerRef));
         throw exn;
       }
-      let seconds$1 = Performance.secondsSince(timerRef);
-      Prometheus.SourceRequestCount.increment(name, chain, "eth_blockNumber");
-      Prometheus.SourceRequestCount.addSeconds(name, chain, "eth_blockNumber", seconds$1);
-      return height;
+      recordRequest("eth_blockNumber", Performance.secondsSince(timerRef));
+      return {
+        height: height,
+        requestStats: drainRequestStats()
+      };
     },
     getItemsOrThrow: getItemsOrThrow,
     createHeightSubscription: createHeightSubscription,

package/src/sources/RpcWebSocketHeightStream.res

@@ -108,11 +108,6 @@ let subscribe = (~wsUrl, ~chainId, ~onHeight: int => unit): (unit => unit) => {
           | NewHead(blockNumber) =>
             errorCount := 0
             resetStaleTimeout()
-            Prometheus.SourceRequestCount.increment(
-              ~sourceName="WebSocket",
-              ~chainId,
-              ~method="eth_subscribe",
-            )
             onHeight(blockNumber)
           | SubscriptionConfirmed(_) => resetStaleTimeout()
           | ErrorResponse =>

package/src/sources/RpcWebSocketHeightStream.res.mjs

@@ -3,7 +3,6 @@
 import * as Rpc from "./Rpc.res.mjs";
 import * as Utils from "../Utils.res.mjs";
 import * as Logging from "../Logging.res.mjs";
-import * as Prometheus from "../Prometheus.res.mjs";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 import * as S$RescriptSchema from "rescript-schema/src/S.res.mjs";
 import * as Primitive_exceptions from "@rescript/runtime/lib/es6/Primitive_exceptions.js";
@@ -105,7 +104,6 @@ function subscribe(wsUrl, chainId, onHeight) {
         }
         errorCount.contents = 0;
         resetStaleTimeout();
-        Prometheus.SourceRequestCount.increment("WebSocket", chainId, "eth_subscribe");
         return onHeight(blockNumber._0);
       } catch (raw_e) {
         let e = Primitive_exceptions.internalToException(raw_e);

package/src/sources/SimulateSource.res

@@ -12,11 +12,11 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
     poweredByHyperSync: false,
     pollingInterval: 0,
     getBlockHashes: (~blockNumbers as _, ~logger as _) => {
-      Promise.resolve(Ok([]))
+      Promise.resolve({Source.result: Ok([]), requestStats: []})
     },
     getHeightOrThrow: () => {
       // Report at least height 1 so the engine doesn't treat 0 as "no blocks available"
-      Promise.resolve(max(endBlock, 1))
+      Promise.resolve({Source.height: max(endBlock, 1), requestStats: []})
     },
     getItemsOrThrow: (
       ~fromBlock as _,
@@ -43,14 +43,16 @@ let make = (~items: array<Internal.item>, ~endBlock: int, ~chain: ChainMap.Chain
         Source.knownHeight: reportedHeight,
         blockHashes: [],
         parsedQueueItems: result,
-        // Simulate keeps the transaction inline on the payload; no store page.
+        // Simulate keeps the transaction and block inline on the payload; no store pages.
         transactionStore: None,
+        blockStore: None,
         fromBlockQueried: 0,
         latestFetchedBlockNumber: reportedHeight,
         latestFetchedBlockTimestamp: 0,
         stats: {
           totalTimeElapsed: 0.,
         },
+        requestStats: [],
       })
     },
   }

package/src/sources/SimulateSource.res.mjs

@@ -13,10 +13,16 @@ function make(items, endBlock, chain) {
     poweredByHyperSync: false,
     pollingInterval: 0,
     getBlockHashes: (param, param$1) => Promise.resolve({
-      TAG: "Ok",
-      _0: []
+      result: {
+        TAG: "Ok",
+        _0: []
+      },
+      requestStats: []
+    }),
+    getHeightOrThrow: () => Promise.resolve({
+      height: Primitive_int.max(endBlock, 1),
+      requestStats: []
     }),
-    getHeightOrThrow: () => Promise.resolve(Primitive_int.max(endBlock, 1)),
     getItemsOrThrow: (param, param$1, param$2, param$3, param$4, param$5, param$6, param$7, param$8, param$9) => {
       let result = delivered.contents ? [] : (delivered.contents = true, items);
       let reportedHeight = Primitive_int.max(endBlock, 1);
@@ -25,12 +31,14 @@ function make(items, endBlock, chain) {
         blockHashes: [],
         parsedQueueItems: result,
         transactionStore: undefined,
+        blockStore: undefined,
         fromBlockQueried: 0,
         latestFetchedBlockNumber: reportedHeight,
         latestFetchedBlockTimestamp: 0,
         stats: {
           "total time elapsed (s)": 0
-        }
+        },
+        requestStats: []
       });
     },
     simulateItems: items

package/src/sources/Source.res

@@ -7,6 +7,11 @@ type blockRangeFetchStats = {
   @as("page fetch time (s)") pageFetchTime?: float,
 }
 
+// A single backend request a source method actually made (cache/dedup hits
+// aren't requests), with the time it took. SourceManager aggregates these
+// per (source, method) into the envio_source_request_* metrics.
+type requestStat = {method: string, seconds: float}
+
 /**
 Thes response returned from a block range fetch
 */
@@ -22,10 +27,22 @@ type blockRangeFetchResponse = {
   // transactionIndex); merged into the chain's store on apply. `None` for
   // sources that keep the transaction inline on the payload (RPC/Fuel/Simulate).
   transactionStore: option<TransactionStore.t>,
+  // Page of blocks for this response's items, keyed by block number; merged into
+  // the chain's store on apply. `None` for sources that keep the block fully
+  // inline on the payload (RPC/Fuel/Simulate).
+  blockStore: option<BlockStore.t>,
   fromBlockQueried: int,
   latestFetchedBlockNumber: int,
   latestFetchedBlockTimestamp: int,
   stats: blockRangeFetchStats,
+  requestStats: array<requestStat>,
+}
+
+type getHeightResponse = {height: int, requestStats: array<requestStat>}
+
+type getBlockHashesResponse = {
+  result: result<array<ReorgDetection.blockDataWithTimestamp>, exn>,
+  requestStats: array<requestStat>,
 }
 
 type getItemsRetry =
@@ -51,11 +68,8 @@ type t = {
   poweredByHyperSync: bool,
   /* Frequency (in ms) used when polling for new events on this network. */
   pollingInterval: int,
-  getBlockHashes: (
-    ~blockNumbers: array<int>,
-    ~logger: Pino.t,
-  ) => promise<result<array<ReorgDetection.blockDataWithTimestamp>, exn>>,
-  getHeightOrThrow: unit => promise<int>,
+  getBlockHashes: (~blockNumbers: array<int>, ~logger: Pino.t) => promise<getBlockHashesResponse>,
+  getHeightOrThrow: unit => promise<getHeightResponse>,
   getItemsOrThrow: (
     ~fromBlock: int,
     ~toBlock: option<int>,

package/src/sources/SourceManager.res

@@ -1,5 +1,10 @@
 type sourceManagerStatus = Idle | WaitingForNewBlock | Querieng
 
+// Cumulative per-method request count/time for a source, aggregated from the
+// requestStat arrays returned by its methods. Rendered into
+// envio_source_request_* by Metrics.renderSourceRequests.
+type requestStatAgg = {mutable count: int, mutable seconds: float}
+
 type sourceState = {
   source: Source.t,
   mutable knownHeight: int,
@@ -9,6 +14,28 @@ type sourceState = {
   // Timestamp (ms) when this source last failed during executeQuery.
   // Used to decide when to attempt recovery to this source.
   mutable lastFailedAt: option<float>,
+  requestStats: dict<requestStatAgg>,
+}
+
+let recordRequestStats = (sourceState: sourceState, requestStats: array<Source.requestStat>) => {
+  requestStats->Array.forEach(({method, seconds}) => {
+    switch sourceState.requestStats->Utils.Dict.dangerouslyGetNonOption(method) {
+    | Some(agg) =>
+      agg.count = agg.count + 1
+      agg.seconds = agg.seconds +. seconds
+    | None => sourceState.requestStats->Dict.set(method, {count: 1, seconds})
+    }
+  })
+}
+
+// Flattened (source, method) aggregates for Metrics.renderSourceRequests to
+// inline into the /metrics response.
+type requestStatSample = {
+  sourceName: string,
+  chainId: int,
+  method: string,
+  count: int,
+  seconds: float,
 }
 
 // Encapsulates the fetching logic for a chain's sources.
@@ -46,6 +73,25 @@ type t = {
 
 let getActiveSource = sourceManager => sourceManager.activeSource
 
+let getRequestStatSamples = (sourceManager: t): array<requestStatSample> => {
+  let samples = []
+  sourceManager.sourcesState->Array.forEach(sourceState => {
+    let chainId = sourceState.source.chain->ChainMap.Chain.toChainId
+    sourceState.requestStats->Utils.Dict.forEachWithKey((agg, method) => {
+      samples
+      ->Array.push({
+        sourceName: sourceState.source.name,
+        chainId,
+        method,
+        count: agg.count,
+        seconds: agg.seconds,
+      })
+      ->ignore
+    })
+  })
+  samples
+}
+
 // Partition queries currently in flight on this chain's sources. Summed across
 // chains by CrossChainState to enforce the indexer-wide concurrency budget.
 let inFlightCount = sourceManager => sourceManager.fetchingPartitionsCount
@@ -187,6 +233,7 @@ let make = (
       pendingHeightResolvers: [],
       disabled: false,
       lastFailedAt: None,
+      requestStats: Dict.make(),
     }),
     activeSource: initialActiveSource,
     waitingForNewBlockStateId: None,
@@ -344,7 +391,9 @@ let getSourceNewHeight = async (
         let h = ref(initialHeight)
         while h.contents <= knownHeight && !(newHeight.contents > initialHeight) {
           try {
-            h := (await source.getHeightOrThrow())
+            let res = await source.getHeightOrThrow()
+            sourceState->recordRequestStats(res.requestStats)
+            h := res.height
           } catch {
           | _ => ()
           }
@@ -363,7 +412,9 @@ let getSourceNewHeight = async (
     | None =>
       // No subscription, use REST polling
       try {
-        let height = await source.getHeightOrThrow()
+        let res = await source.getHeightOrThrow()
+        sourceState->recordRequestStats(res.requestStats)
+        let height = res.height
 
         newHeight := height
         if height <= knownHeight {
@@ -385,6 +436,9 @@ let getSourceNewHeight = async (
               }
             })
             sourceState.unsubscribe = Some(unsubscribe)
+            // Count a subscription (re)start rather than every pushed height —
+            // there's no request/response to time here.
+            sourceState->recordRequestStats([{Source.method: "heightSubscription", seconds: 0.}])
           | _ =>
             // Slowdown polling when the chain isn't progressing
             let pollingInterval = if reducedPolling {
@@ -680,16 +734,11 @@ let executeQuery = async (
         ~partitionId=query.partitionId,
         ~knownHeight,
         ~selection=query.selection,
-        // Ceil (not truncate) so a sub-1 estimate from a sparse partition over a
-        // small range doesn't round down to 0 and ask the backend to cap the
-        // response at nothing — 0 items is indistinguishable from "no signal".
-        ~itemsTarget={
-          let est = query.estResponseSize->Math.ceil->Float.toInt
-          est > 0 ? est : FetchState.minEstResponseSize->Float.toInt
-        },
+        ~itemsTarget=query.itemsTarget,
         ~retry,
         ~logger,
       )
+      sourceState->recordRequestStats(response.requestStats)
       sourceState.lastFailedAt = None
       responseRef := Some(response)
     } catch {
@@ -829,7 +878,8 @@ let getBlockHashes = async (sourceManager: t, ~blockNumbers: array<int>, ~isReal
 
     try {
       let res = await source.getBlockHashes(~blockNumbers, ~logger)
-      switch res {
+      sourceState->recordRequestStats(res.requestStats)
+      switch res.result {
       | Ok(data) =>
         sourceState.lastFailedAt = None
         responseRef := Some(data)