feat: implement metrics for data columns

ChainSafe · Sep 19, 2024 · 5230b83 · 5230b83
1 parent 57dbb4c
commit 5230b83
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/packages/beacon-node/src/api/impl/beacon/blocks/index.ts b/packages/beacon-node/src/api/impl/beacon/blocks/index.ts
@@ -79,7 +79,9 @@ export function getBeaconBlockApi({
       const fork = config.getForkName(signedBlock.message.slot);
       let blockData: BlockInputData;
       if (fork === ForkName.peerdas) {
+        const timer = chain.metrics?.peerDas.sidecarComputationTimeInSec.startTimer();
         dataColumnSidecars = computeDataColumnSidecars(config, signedBlock, signedBlockOrContents);
+        timer?.();
         blockData = {
           fork,
           dataColumnsLen: dataColumnSidecars.length,

diff --git a/packages/beacon-node/src/chain/blocks/verifyBlocksDataAvailability.ts b/packages/beacon-node/src/chain/blocks/verifyBlocksDataAvailability.ts
@@ -76,7 +76,7 @@ export async function verifyBlocksDataAvailability(
 }
 
 async function maybeValidateBlobs(
-  chain: {config: ChainForkConfig; genesisTime: UintNum64; logger: Logger},
+  chain: {config: ChainForkConfig; genesisTime: UintNum64; logger: Logger; metrics: Metrics | null},
   blockInput: BlockInput,
   opts: ImportBlockOpts
 ): Promise<{dataAvailabilityStatus: DataAvailabilityStatus; availableBlockInput: BlockInput}> {
@@ -119,7 +119,9 @@ async function maybeValidateBlobs(
         const {dataColumns} = blockData;
         const skipProofsCheck = opts.validBlobSidecars === BlobSidecarValidation.Individual;
         // might require numColumns, custodyColumns from blockData as input to below
+        const timer = chain.metrics?.peerDas.batchColumnVerificationTimeInSec.startTimer();
         validateDataColumnsSidecars(blockSlot, beaconBlockRoot, blobKzgCommitments, dataColumns, {skipProofsCheck});
+        timer?.();
       }
 
       const availableBlockInput = getBlockInput.availableData(

diff --git a/packages/beacon-node/src/chain/validation/dataColumnSidecar.ts b/packages/beacon-node/src/chain/validation/dataColumnSidecar.ts
@@ -43,7 +43,11 @@ export async function validateGossipDataColumnSidecar(
     });
   }
 
-  if (!validateInclusionProof(dataColumnSideCar)) {
+  const timer = chain.metrics?.peerDas.inclusionProofVerificationTimeInSec.startTimer();
+  const isValid = validateInclusionProof(dataColumnSideCar);
+  timer?.();
+
+  if (!isValid) {
     throw new DataColumnSidecarGossipError(GossipAction.REJECT, {
       code: DataColumnSidecarErrorCode.INCLUSION_PROOF_INVALID,
       slot: dataColumnSideCar.signedBlockHeader.message.slot,

diff --git a/packages/beacon-node/src/network/processor/gossipHandlers.ts b/packages/beacon-node/src/network/processor/gossipHandlers.ts
@@ -282,12 +282,14 @@ function getDefaultHandlers(modules: ValidatorFnsModules, options: GossipHandler
     );
 
     try {
+      metrics?.gossipColumn.processRequestCount.inc();
       await validateGossipDataColumnSidecar(chain, dataColumnSidecar, gossipIndex);
+      metrics?.gossipColumn.processSuccessCount.inc();
       const recvToValidation = Date.now() / 1000 - seenTimestampSec;
       const validationTime = recvToValidation - recvToValLatency;
 
       metrics?.gossipBlob.recvToValidation.observe(recvToValidation);
-      metrics?.gossipBlob.validationTime.observe(validationTime);
+      metrics?.gossipColumn.verificationTimeInSec.observe(validationTime);
 
       logger.debug("Received gossip dataColumn", {
         slot: slot,
@@ -650,6 +652,7 @@ function getDefaultHandlers(modules: ValidatorFnsModules, options: GossipHandler
 
       chain.emitter.emit(routes.events.EventType.attestation, signedAggregateAndProof.message.aggregate);
     },
+
     [GossipType.beacon_attestation]: async ({
       gossipData,
       topic,