chore: logging

Author: alexghr

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

@@ -10,7 +10,6 @@ import {
   type Meter,
   Metrics,
   type ObservableGauge,
-  type ObservableUpDownCounter,
   type TelemetryClient,
   type Tracer,
   type UpDownCounter,
@@ -60,7 +59,7 @@ export class ProverNodeJobMetrics {
 
 export class ProverNodeRewardsMetrics {
   private rewards: ObservableGauge;
-  private accumulatedRewards: ObservableUpDownCounter;
+  private accumulatedRewards: UpDownCounter;
   private prevEpoch = -1n;
   private proofSubmissionWindow = 0n;
 
@@ -75,19 +74,19 @@ export class ProverNodeRewardsMetrics {
       description: 'The rewards earned',
     });
 
-    this.accumulatedRewards = this.meter.createObservableUpDownCounter(Metrics.PROVER_NODE_REWARDS_TOTAL, {
+    this.accumulatedRewards = this.meter.createUpDownCounter(Metrics.PROVER_NODE_REWARDS_TOTAL, {
       valueType: ValueType.DOUBLE,
       description: 'The rewards earned (total)',
     });
   }
 
   public async start() {
     this.proofSubmissionWindow = await this.rollup.getProofSubmissionWindow();
-    this.meter.addBatchObservableCallback(this.observe, [this.rewards, this.accumulatedRewards]);
+    this.meter.addBatchObservableCallback(this.observe, [this.rewards]);
   }
 
   public stop() {
-    this.meter.removeBatchObservableCallback(this.observe, [this.rewards, this.accumulatedRewards]);
+    this.meter.removeBatchObservableCallback(this.observe, [this.rewards]);
   }
 
   private observe = async (observer: BatchObservableResult): Promise<void> => {
@@ -101,14 +100,14 @@ export class ProverNodeRewardsMetrics {
       const fmt = parseFloat(formatUnits(rewards, 18));
 
       observer.observe(this.rewards, fmt, {
-        [Attributes.L1_SENDER]: this.coinbase.toString(),
+        [Attributes.COINBASE]: this.coinbase.toString(),
       });
 
       // only accumulate once per epoch
       if (closedEpoch > this.prevEpoch) {
         this.prevEpoch = closedEpoch;
-        observer.observe(this.accumulatedRewards, fmt, {
-          [Attributes.L1_SENDER]: this.coinbase.toString(),
+        this.accumulatedRewards.add(fmt, {
+          [Attributes.COINBASE]: this.coinbase.toString(),
         });
       }
     }

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

@@ -1,5 +1,6 @@
 import { timesParallel } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { Fr } from '@aztec/foundation/fields';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
@@ -67,7 +68,9 @@ describe('prover-node', () => {
     );
 
   beforeEach(async () => {
-    prover = mock<EpochProverManager>();
+    prover = mock<EpochProverManager>({
+      getProverId: () => Fr.random(),
+    });
     publisher = mock<ProverNodePublisher>();
     l2BlockSource = mock<L2BlockSource>();
     l1ToL2MessageSource = mock<L1ToL2MessageSource>();

yarn-project/sequencer-client/src/publisher/sequencer-publisher.test.ts

@@ -281,7 +281,7 @@ describe('SequencerPublisher', () => {
     expect(enqueued).toEqual(true);
     const result = await publisher.sendRequests();
 
-    expect(result?.errorMsg).toEqual('Test error');
+    expect(result?.result?.errorMsg).toEqual('Test error');
   });
 
   it('does not send requests if interrupted', async () => {

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

@@ -150,7 +150,7 @@ export class SequencerMetrics {
 
     const fmt = parseFloat(formatUnits(rewards, 18));
     observer.observe(this.rewards, fmt, {
-      [Attributes.L1_SENDER]: this.coinbase.toString(),
+      [Attributes.COINBASE]: this.coinbase.toString(),
     });
   };
 

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

@@ -64,6 +64,8 @@ export const ERROR_TYPE = 'aztec.error_type';
 export const L1_TX_TYPE = 'aztec.l1.tx_type';
 /** The L1 address of the entity that sent a transaction to L1 */
 export const L1_SENDER = 'aztec.l1.sender';
+/** The L1 address receiving rewards */
+export const COINBASE = 'aztec.coinbase';
 /** The phase of the transaction */
 export const TX_PHASE_NAME = 'aztec.tx.phase_name';
 /** The reason for disconnecting a peer */