envio 3.3.0 → 3.3.1

package/src/Main.res

@@ -1,4 +1,22 @@
-type chainData = ChainState.chainData
+// The public console/state chain shape. Kept to exactly this field set for
+// backward compatibility with consumers like RACE — new metric fields stay off
+// the HTTP response.
+type chainData = {
+  chainId: float,
+  poweredByHyperSync: bool,
+  firstEventBlockNumber: option<int>,
+  latestProcessedBlock: option<int>,
+  timestampCaughtUpToHeadOrEndblock: option<Date.t>,
+  numEventsProcessed: float,
+  latestFetchedBlockNumber: int,
+  // Need this for API backwards compatibility
+  @as("currentBlockHeight")
+  knownHeight: int,
+  numBatchesFetched: int,
+  startBlock: int,
+  endBlock: option<int>,
+  numAddresses: int,
+}
 @tag("status")
 type state =
   | @as("disabled") Disabled({})
@@ -12,6 +30,21 @@ type state =
       rollbackOnReorg: bool,
     })
 
+let toChainData = (m: Metrics.chainMetrics): chainData => {
+  chainId: m.chainId,
+  poweredByHyperSync: m.poweredByHyperSync,
+  firstEventBlockNumber: m.firstEventBlockNumber,
+  latestProcessedBlock: m.latestProcessedBlock,
+  timestampCaughtUpToHeadOrEndblock: m.timestampCaughtUpToHeadOrEndblock,
+  numEventsProcessed: m.numEventsProcessed,
+  latestFetchedBlockNumber: m.latestFetchedBlockNumber,
+  knownHeight: m.knownHeight,
+  numBatchesFetched: m.numBatchesFetched,
+  startBlock: m.startBlock,
+  endBlock: m.endBlock,
+  numAddresses: m.numAddresses,
+}
+
 let chainDataSchema = S.schema((s): chainData => {
   chainId: s.matches(S.float),
   poweredByHyperSync: s.matches(S.bool),
@@ -331,13 +364,7 @@ let getGlobalIndexer = (): 'indexer => {
 
   let onBlockFn = (rawOptions: 'a, handler: 'b) => {
     HandlerRegister.throwIfFinishedRegistration(~methodName="onBlock")
-    let raw =
-      rawOptions->(
-        Utils.magic: 'a => {
-          "name": string,
-          "where": unknown,
-        }
-      )
+    let raw = rawOptions->(Utils.magic: 'a => {"name": string, "where": unknown})
     HandlerRegister.registerOnBlock(
       ~name=raw["name"],
       ~where=raw["where"],
@@ -496,23 +523,19 @@ let startServer = (~getState, ~persistence: Persistence.t, ~isDevelopmentMode: b
     }
   })
 
-  let runtimeRegistry = PromClient.makeRegistry()
-  PromClient.collectDefaultMetrics({"register": runtimeRegistry})
+  Metrics.startRuntimeCollectors()
 
   app->get("/metrics", (_req, res) => {
-    res->set("Content-Type", PromClient.defaultRegister->PromClient.getContentType)
+    res->set("Content-Type", Metrics.contentType)
     let _ =
-      Metrics.collect(~state=getIndexerState())->Promise.thenResolve(metrics =>
-        res->endWithData(metrics)
+      res->endWithData(
+        Metrics.collect(~metrics=getIndexerState()->Option.map(IndexerState.toMetrics)),
       )
   })
 
   app->get("/metrics/runtime", (_req, res) => {
-    res->set("Content-Type", runtimeRegistry->PromClient.getContentType)
-    let _ =
-      runtimeRegistry
-      ->PromClient.metrics
-      ->Promise.thenResolve(metrics => res->endWithData(metrics))
+    res->set("Content-Type", Metrics.contentType)
+    let _ = res->endWithData(Metrics.collectRuntime())
   })
 
   let server = app->listen(Env.serverPort)
@@ -636,17 +659,13 @@ let start = async (
     (onErrorReject.contents->Option.getUnsafe)(FatalError(errHandler.exn->Utils.prettifyExn))
   }
   let envioVersion = Utils.EnvioPackage.value.version
-  Prometheus.Info.set(~version=envioVersion)
-  Prometheus.ProcessStartTimeSeconds.set()
-  Prometheus.RollbackEnabled.set(~enabled=config.shouldRollbackOnReorg)
 
   if !isTest {
     startServer(~persistence, ~isDevelopmentMode, ~getState=() =>
       switch getIndexerState() {
       | None => Initializing({})
       | Some(state) => {
-          let chains =
-            state->IndexerState.chainStates->Dict.valuesToArray->Array.map(ChainState.toChainData)
+          let chains = (state->IndexerState.toMetrics).chains->Array.map(toChainData)
           Active({
             envioVersion,
             chains,

package/src/Main.res.mjs

@@ -12,11 +12,9 @@ import * as Process from "process";
 import * as ChainMap from "./ChainMap.res.mjs";
 import * as PgStorage from "./PgStorage.res.mjs";
 import * as ChainState from "./ChainState.res.mjs";
-import * as Prometheus from "./Prometheus.res.mjs";
 import * as EnvioGlobal from "./EnvioGlobal.res.mjs";
 import * as IndexerLoop from "./IndexerLoop.res.mjs";
 import * as Persistence from "./Persistence.res.mjs";
-import * as PromClient from "prom-client";
 import Yargs from "yargs/yargs";
 import * as IndexerState from "./IndexerState.res.mjs";
 import * as ErrorHandling from "./ErrorHandling.res.mjs";
@@ -30,6 +28,23 @@ 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";
 
+function toChainData(m) {
+  return {
+    chainId: m.chainId,
+    poweredByHyperSync: m.poweredByHyperSync,
+    firstEventBlockNumber: m.firstEventBlockNumber,
+    latestProcessedBlock: m.latestProcessedBlock,
+    timestampCaughtUpToHeadOrEndblock: m.timestampCaughtUpToHeadOrEndblock,
+    numEventsProcessed: m.numEventsProcessed,
+    latestFetchedBlockNumber: m.latestFetchedBlockNumber,
+    currentBlockHeight: m.knownHeight,
+    numBatchesFetched: m.numBatchesFetched,
+    startBlock: m.startBlock,
+    endBlock: m.endBlock,
+    numAddresses: m.numAddresses
+  };
+}
+
 let chainDataSchema = S$RescriptSchema.schema(s => ({
   chainId: s.m(S$RescriptSchema.float),
   poweredByHyperSync: s.m(S$RescriptSchema.bool),
@@ -409,17 +424,14 @@ function startServer(getState, persistence, isDevelopmentMode) {
       res.json(false);
     }
   });
-  let runtimeRegistry = new PromClient.Registry();
-  PromClient.collectDefaultMetrics({
-    register: runtimeRegistry
-  });
+  Metrics.startRuntimeCollectors();
   app.get("/metrics", (_req, res) => {
-    res.set("Content-Type", PromClient.register.contentType);
-    Metrics.collect(EnvioGlobal.value.indexerState).then(metrics => res.end(metrics));
+    res.set("Content-Type", Metrics.contentType);
+    res.end(Metrics.collect(Stdlib_Option.map(EnvioGlobal.value.indexerState, IndexerState.toMetrics)));
   });
   app.get("/metrics/runtime", (_req, res) => {
-    res.set("Content-Type", runtimeRegistry.contentType);
-    runtimeRegistry.metrics().then(metrics => res.end(metrics));
+    res.set("Content-Type", Metrics.contentType);
+    res.end(Metrics.collectRuntime());
   });
   let server = app.listen(Env.serverPort);
   server.on("error", err => {
@@ -469,27 +481,14 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
   EnvioGlobal.value.persistence = Primitive_option.some(persistence$1);
   await Persistence.init(persistence$1, ChainMap.values(config.chainMap), Config.stripSensitiveData(Config.getPublicConfigJson()), isDevelopmentMode ? "envio dev -r" : "envio start -r", isDevelopmentMode ? "envio dev" : "envio start", reset);
   let registrationsByChainId = await HandlerLoader.registerAllHandlers(config);
-  let config$1 = isTest ? ({
-      name: config.name,
-      description: config.description,
-      handlers: config.handlers,
-      contractHandlers: config.contractHandlers,
-      shouldRollbackOnReorg: false,
-      shouldSaveFullHistory: config.shouldSaveFullHistory,
-      storage: config.storage,
-      chainMap: config.chainMap,
-      defaultChain: config.defaultChain,
-      ecosystem: config.ecosystem,
-      enableRawEvents: config.enableRawEvents,
-      maxAddrInPartition: config.maxAddrInPartition,
-      batchSize: config.batchSize,
-      lowercaseAddresses: config.lowercaseAddresses,
-      isDev: config.isDev,
-      userEntitiesByName: config.userEntitiesByName,
-      userEntities: config.userEntities,
-      allEntities: config.allEntities,
-      allEnums: config.allEnums
-    }) : config;
+  let config$1;
+  if (isTest) {
+    let newrecord = {...config};
+    newrecord.shouldRollbackOnReorg = false;
+    config$1 = newrecord;
+  } else {
+    config$1 = config;
+  }
   let config$2 = patchConfig !== undefined ? patchConfig(config$1, registrationsByChainId) : config$1;
   let onErrorReject = {
     contents: undefined
@@ -505,9 +504,6 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
     });
   };
   let envioVersion = Utils.EnvioPackage.value.version;
-  Prometheus.Info.set(envioVersion);
-  Prometheus.ProcessStartTimeSeconds.set();
-  Prometheus.RollbackEnabled.set(config$2.shouldRollbackOnReorg);
   if (!isTest) {
     startServer(() => {
       let state = EnvioGlobal.value.indexerState;
@@ -517,7 +513,7 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
         };
       }
       let state$1 = Primitive_option.valFromOption(state);
-      let chains = Object.values(IndexerState.chainStates(state$1)).map(ChainState.toChainData);
+      let chains = IndexerState.toMetrics(state$1).chains.map(toChainData);
       return {
         status: "active",
         envioVersion: envioVersion,
@@ -538,6 +534,7 @@ async function start(persistence, resetOpt, isTestOpt, exitAfterFirstEventBlockO
 }
 
 export {
+  toChainData,
   chainDataSchema,
   stateSchema,
   getIndexerState,