chore: backport to v2 (#18094)

Backports of
#18091
#17638 
#17531

---------

Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: Claude <[email protected]>

Author: 3 people

yarn-project/archiver/src/archiver/instrumentation.ts

@@ -152,6 +152,9 @@ export class ArchiverInstrumentation {
   }
 
   public processNewMessages(count: number, syncPerMessageMs: number) {
+    if (count === 0) {
+      return;
+    }
     this.syncMessageCount.add(count);
     this.syncDurationPerMessage.record(Math.ceil(syncPerMessageMs));
   }

yarn-project/prover-node/src/factory.ts

@@ -179,6 +179,7 @@ export async function createProverNode(
       'txGatheringIntervalMs',
       'txGatheringTimeoutMs',
       'proverNodeFailedEpochStore',
+      'proverNodeDisableProofPublish',
       'dataDirectory',
       'l1ChainId',
       'rollupVersion',

yarn-project/telemetry-client/src/metrics.ts

@@ -204,8 +204,9 @@ export const VALIDATOR_RE_EXECUTION_MANA = 'aztec.validator.re_execution_mana';
 export const VALIDATOR_RE_EXECUTION_TX_COUNT = 'aztec.validator.re_execution_tx_count';
 
 export const VALIDATOR_FAILED_REEXECUTION_COUNT = 'aztec.validator.failed_reexecution_count';
-export const VALIDATOR_ATTESTATION_COUNT = 'aztec.validator.attestation_count';
-export const VALIDATOR_FAILED_ATTESTATION_COUNT = 'aztec.validator.failed_attestation_count';
+export const VALIDATOR_ATTESTATION_SUCCESS_COUNT = 'aztec.validator.attestation_success_count';
+export const VALIDATOR_ATTESTATION_FAILED_BAD_PROPOSAL_COUNT = 'aztec.validator.attestation_failed_bad_proposal_count';
+export const VALIDATOR_ATTESTATION_FAILED_NODE_ISSUE_COUNT = 'aztec.validator.attestation_failed_node_issue_count';
 
 export const NODEJS_EVENT_LOOP_DELAY_MIN = 'nodejs.eventloop.delay.min';
 export const NODEJS_EVENT_LOOP_DELAY_MEAN = 'nodejs.eventloop.delay.mean';

yarn-project/validator-client/src/metrics.ts

@@ -10,8 +10,9 @@ import {
 
 export class ValidatorMetrics {
   private failedReexecutionCounter: UpDownCounter;
-  private attestationsCount: UpDownCounter;
-  private failedAttestationsCount: UpDownCounter;
+  private successfulAttestationsCount: UpDownCounter;
+  private failedAttestationsBadProposalCount: UpDownCounter;
+  private failedAttestationsNodeIssueCount: UpDownCounter;
 
   private reexMana: Histogram;
   private reexTx: Histogram;
@@ -26,15 +27,26 @@ export class ValidatorMetrics {
       valueType: ValueType.INT,
     });
 
-    this.attestationsCount = meter.createUpDownCounter(Metrics.VALIDATOR_ATTESTATION_COUNT, {
-      description: 'The number of attestations',
+    this.successfulAttestationsCount = meter.createUpDownCounter(Metrics.VALIDATOR_ATTESTATION_SUCCESS_COUNT, {
+      description: 'The number of successful attestations',
       valueType: ValueType.INT,
     });
 
-    this.failedAttestationsCount = meter.createUpDownCounter(Metrics.VALIDATOR_FAILED_ATTESTATION_COUNT, {
-      description: 'The number of failed attestations',
-      valueType: ValueType.INT,
-    });
+    this.failedAttestationsBadProposalCount = meter.createUpDownCounter(
+      Metrics.VALIDATOR_ATTESTATION_FAILED_BAD_PROPOSAL_COUNT,
+      {
+        description: 'The number of failed attestations due to invalid block proposals',
+        valueType: ValueType.INT,
+      },
+    );
+
+    this.failedAttestationsNodeIssueCount = meter.createUpDownCounter(
+      Metrics.VALIDATOR_ATTESTATION_FAILED_NODE_ISSUE_COUNT,
+      {
+        description: 'The number of failed attestations due to node issues (timeout, missing data, etc.)',
+        valueType: ValueType.INT,
+      },
+    );
 
     this.reexMana = meter.createHistogram(Metrics.VALIDATOR_RE_EXECUTION_MANA, {
       description: 'The mana consumed by blocks',
@@ -69,14 +81,19 @@ export class ValidatorMetrics {
     });
   }
 
-  public incAttestations(num: number) {
-    this.attestationsCount.add(num);
+  public incSuccessfulAttestations(num: number) {
+    this.successfulAttestationsCount.add(num);
+  }
+
+  public incFailedAttestationsBadProposal(num: number, reason: string) {
+    this.failedAttestationsBadProposalCount.add(num, {
+      [Attributes.ERROR_TYPE]: reason,
+    });
   }
 
-  public incFailedAttestations(num: number, reason: string, inCommittee: boolean) {
-    this.failedAttestationsCount.add(num, {
+  public incFailedAttestationsNodeIssue(num: number, reason: string) {
+    this.failedAttestationsNodeIssueCount.add(num, {
       [Attributes.ERROR_TYPE]: reason,
-      [Attributes.VALIDATOR_STATUS]: inCommittee ? 'in-committee' : 'none',
     });
   }
 }

yarn-project/validator-client/src/validator.ts

@@ -265,7 +265,6 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
     // Check that I have any address in current committee before attesting
     const inCommittee = await this.epochCache.filterInCommittee(slotNumber, this.getValidatorAddresses());
     const partOfCommittee = inCommittee.length > 0;
-    const incFailedAttestation = (reason: string) => this.metrics.incFailedAttestations(1, reason, partOfCommittee);
 
     const proposalInfo = { ...proposal.toBlockInfo(), proposer: proposer.toString() };
     this.log.info(`Received proposal for slot ${slotNumber}`, {
@@ -289,9 +288,27 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     if (!validationResult.isValid) {
       this.log.warn(`Proposal validation failed: ${validationResult.reason}`, proposalInfo);
-      incFailedAttestation(validationResult.reason || 'unknown');
 
-      // Slash invalid block proposals
+      // Only track attestation failure metrics if we're actually in the committee
+      if (partOfCommittee) {
+        const reason = validationResult.reason || 'unknown';
+        // Classify failure reason: bad proposal vs node issue
+        const badProposalReasons: BlockProposalValidationFailureReason[] = [
+          'invalid_proposal',
+          'state_mismatch',
+          'failed_txs',
+          'in_hash_mismatch',
+          'parent_block_wrong_slot',
+        ];
+
+        if (badProposalReasons.includes(reason as BlockProposalValidationFailureReason)) {
+          this.metrics.incFailedAttestationsBadProposal(1, reason);
+        } else {
+          this.metrics.incFailedAttestationsNodeIssue(1, reason);
+        }
+      }
+
+      // Slash invalid block proposals (can happen even when not in committee)
       if (
         validationResult.reason &&
         SLASHABLE_BLOCK_PROPOSAL_VALIDATION_RESULT.includes(validationResult.reason) &&
@@ -311,7 +328,7 @@ export class ValidatorClient extends (EventEmitter as new () => WatcherEmitter)
 
     // Provided all of the above checks pass, we can attest to the proposal
     this.log.info(`Attesting to proposal for block at slot ${slotNumber}`, proposalInfo);
-    this.metrics.incAttestations(inCommittee.length);
+    this.metrics.incSuccessfulAttestations(inCommittee.length);
 
     // If the above function does not throw an error, then we can attest to the proposal
     return this.createBlockAttestationsFromProposal(proposal, inCommittee);