feat(block-producer): instrument mempool

crates/block-producer/src/batch_builder/batch.rs

@@ -16,7 +16,7 @@ use miden_objects::{
 };
 use tracing::instrument;
 
-use crate::errors::BuildBatchError;
+use crate::{errors::BuildBatchError, COMPONENT};
 
 // BATCH ID
 // ================================================================================================
@@ -114,7 +114,7 @@ impl TransactionBatch {
     /// - There are duplicated output notes or unauthenticated notes found across all transactions
     ///   in the batch.
     /// - Hashes for corresponding input notes and output notes don't match.
-    #[instrument(target = "miden-block-producer", name = "new_batch", skip_all, err)]
+    #[instrument(target = COMPONENT, name = "new_batch", skip_all, err)]
     pub fn new<'a, I>(
         txs: impl IntoIterator<Item = &'a ProvenTransaction, IntoIter = I>,
         found_unauthenticated_notes: NoteAuthenticationInfo,

crates/block-producer/src/batch_builder/mod.rs

@@ -234,7 +234,7 @@ impl WorkerPool {
         Ok(())
     }
 
-    #[instrument(target = "miden-block-producer", skip_all, err, fields(batch_id))]
+    #[instrument(target = COMPONENT, skip_all, err, fields(batch_id))]
     fn build_batch(
         txs: Vec<AuthenticatedTransaction>,
     ) -> Result<TransactionBatch, BuildBatchError> {

crates/block-producer/src/block_builder/mod.rs

@@ -90,7 +90,7 @@ impl BlockBuilder {
         }
     }
 
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     async fn build_block(&self, batches: &[TransactionBatch]) -> Result<(), BuildBlockError> {
         info!(
             target: COMPONENT,

crates/block-producer/src/mempool/mod.rs

@@ -6,13 +6,14 @@ use miden_objects::{
     MAX_ACCOUNTS_PER_BATCH, MAX_INPUT_NOTES_PER_BATCH, MAX_OUTPUT_NOTES_PER_BATCH,
 };
 use tokio::sync::Mutex;
+use tracing::instrument;
 use transaction_graph::TransactionGraph;
 
 use crate::{
     batch_builder::batch::{BatchId, TransactionBatch},
     domain::transaction::AuthenticatedTransaction,
     errors::AddTransactionError,
-    SERVER_MAX_BATCHES_PER_BLOCK, SERVER_MAX_TXS_PER_BATCH,
+    COMPONENT, SERVER_MAX_BATCHES_PER_BLOCK, SERVER_MAX_TXS_PER_BATCH,
 };
 
 mod batch_graph;
@@ -215,6 +216,7 @@ impl Mempool {
     /// # Errors
     ///
     /// Returns an error if the transaction's initial conditions don't match the current state.
+    #[instrument(target = COMPONENT, skip_all, fields(tx=%transaction.id()))]
     pub fn add_transaction(
         &mut self,
         transaction: AuthenticatedTransaction,
@@ -234,6 +236,7 @@ impl Mempool {
     /// Transactions are returned in a valid execution ordering.
     ///
     /// Returns `None` if no transactions are available.
+    #[instrument(target = COMPONENT, skip_all)]
     pub fn select_batch(&mut self) -> Option<(BatchId, Vec<AuthenticatedTransaction>)> {
         let (batch, parents) = self.transactions.select_batch(self.batch_budget);
         if batch.is_empty() {
@@ -249,6 +252,7 @@ impl Mempool {
     /// Drops the failed batch and all of its descendants.
     ///
     /// Transactions are placed back in the queue.
+    #[instrument(target = COMPONENT, skip_all, fields(batch))]
     pub fn batch_failed(&mut self, batch: BatchId) {
         // Batch may already have been removed as part of a parent batches failure.
         if !self.batches.contains(&batch) {
@@ -272,6 +276,7 @@ impl Mempool {
     }
 
     /// Marks a batch as proven if it exists.
+    #[instrument(target = COMPONENT, skip_all, fields(batch=%batch.id()))]
     pub fn batch_proved(&mut self, batch: TransactionBatch) {
         // Batch may have been removed as part of a parent batches failure.
         if !self.batches.contains(&batch.id()) {
@@ -290,6 +295,7 @@ impl Mempool {
     /// # Panics
     ///
     /// Panics if there is already a block in flight.
+    #[instrument(target = COMPONENT, skip_all)]
     pub fn select_block(&mut self) -> (BlockNumber, Vec<TransactionBatch>) {
         assert!(self.block_in_progress.is_none(), "Cannot have two blocks inflight.");
 
@@ -304,6 +310,7 @@ impl Mempool {
     /// # Panics
     ///
     /// Panics if blocks are completed out-of-order or if there is no block in flight.
+    #[instrument(target = COMPONENT, skip_all, fields(block_number))]
     pub fn block_committed(&mut self, block_number: BlockNumber) {
         assert_eq!(block_number, self.chain_tip.next(), "Blocks must be submitted sequentially");
 
@@ -326,6 +333,7 @@ impl Mempool {
     ///
     /// Panics if there is no block in flight or if the block number does not match the current
     /// inflight block.
+    #[instrument(target = COMPONENT, skip_all, fields(block_number))]
     pub fn block_failed(&mut self, block_number: BlockNumber) {
         assert_eq!(block_number, self.chain_tip.next(), "Blocks must be submitted sequentially");
 

crates/block-producer/src/server/api.rs

@@ -35,7 +35,7 @@ where
     BB: BatchBuilder,
 {
     #[instrument(
-        target = "miden-block-producer",
+        target = COMPONENT,
         name = "block_producer:submit_proven_transaction",
         skip_all,
         err

crates/block-producer/src/server/mod.rs

@@ -201,7 +201,7 @@ impl BlockProducerRpcServer {
     }
 
     #[instrument(
-        target = "miden-block-producer",
+        target = COMPONENT,
         name = "block_producer:submit_proven_transaction",
         skip_all,
         err

crates/block-producer/src/state_view/mod.rs

@@ -138,7 +138,7 @@ impl<S> ApplyBlock for DefaultStateView<S>
 where
     S: Store,
 {
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     async fn apply_block(&self, block: &Block) -> Result<(), ApplyBlockError> {
         self.store.apply_block(block).await?;
 
@@ -179,7 +179,7 @@ where
 /// - all notes in `tx_notes_not_in_store` are currently in flight
 ///
 /// The account state is not verified as it is performed by [InflightAccountStates].
-#[instrument(target = "miden-block-producer", skip_all, err)]
+#[instrument(target = COMPONENT, skip_all, err)]
 fn ensure_in_flight_constraints(
     candidate_tx: &ProvenTransaction,
     accounts_in_flight: &InflightAccountStates,
@@ -225,7 +225,7 @@ fn ensure_in_flight_constraints(
 /// - input notes must not be already consumed
 ///
 /// Returns a list of unauthenticated input notes that were not found in the store.
-#[instrument(target = "miden-block-producer", skip_all, err)]
+#[instrument(target = COMPONENT, skip_all, err)]
 fn ensure_tx_inputs_constraints(
     candidate_tx: &ProvenTransaction,
     tx_inputs: TransactionInputs,

crates/block-producer/src/store/mod.rs

@@ -130,7 +130,7 @@ impl StoreClient {
     }
 
     /// Returns the latest block's header from the store.
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     pub async fn latest_header(&self) -> Result<BlockHeader, StoreError> {
         let response = self
             .inner
@@ -146,7 +146,7 @@ impl StoreClient {
         BlockHeader::try_from(response).map_err(Into::into)
     }
 
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     pub async fn get_tx_inputs(
         &self,
         proven_tx: &ProvenTransaction,
@@ -183,7 +183,7 @@ impl StoreClient {
         Ok(tx_inputs)
     }
 
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     pub async fn get_block_inputs(
         &self,
         updated_accounts: impl Iterator<Item = AccountId> + Send,
@@ -201,7 +201,7 @@ impl StoreClient {
         store_response.try_into().map_err(Into::into)
     }
 
-    #[instrument(target = "miden-block-producer", skip_all, err)]
+    #[instrument(target = COMPONENT, skip_all, err)]
     pub async fn apply_block(&self, block: &Block) -> Result<(), StoreError> {
         let request = tonic::Request::new(ApplyBlockRequest { block: block.to_bytes() });
 

crates/rpc/src/server/api.rs

@@ -59,7 +59,7 @@ impl RpcApi {
 #[tonic::async_trait]
 impl api_server::Api for RpcApi {
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:check_nullifiers",
         skip_all,
         ret(level = "debug"),
@@ -82,7 +82,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:check_nullifiers_by_prefix",
         skip_all,
         ret(level = "debug"),
@@ -98,7 +98,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_block_header_by_number",
         skip_all,
         ret(level = "debug"),
@@ -114,7 +114,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:sync_state",
         skip_all,
         ret(level = "debug"),
@@ -130,7 +130,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:sync_notes",
         skip_all,
         ret(level = "debug"),
@@ -146,7 +146,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_notes_by_id",
         skip_all,
         ret(level = "debug"),
@@ -167,7 +167,7 @@ impl api_server::Api for RpcApi {
         self.store.clone().get_notes_by_id(request).await
     }
 
-    #[instrument(target = "miden-rpc", name = "rpc:submit_proven_transaction", skip_all, err)]
+    #[instrument(target = COMPONENT, name = "rpc:submit_proven_transaction", skip_all, err)]
     async fn submit_proven_transaction(
         &self,
         request: Request<SubmitProvenTransactionRequest>,
@@ -190,7 +190,7 @@ impl api_server::Api for RpcApi {
 
     /// Returns details for public (public) account by id.
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_account_details",
         skip_all,
         ret(level = "debug"),
@@ -214,7 +214,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_block_by_number",
         skip_all,
         ret(level = "debug"),
@@ -232,7 +232,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_account_state_delta",
         skip_all,
         ret(level = "debug"),
@@ -250,7 +250,7 @@ impl api_server::Api for RpcApi {
     }
 
     #[instrument(
-        target = "miden-rpc",
+        target = COMPONENT,
         name = "rpc:get_account_proofs",
         skip_all,
         ret(level = "debug"),

crates/store/src/db/migrations.rs

@@ -24,7 +24,7 @@ fn up(s: &'static str) -> M<'static> {
 const DB_MIGRATION_HASH_FIELD: &str = "db-migration-hash";
 const DB_SCHEMA_VERSION_FIELD: &str = "db-schema-version";
 
-#[instrument(target = "miden-store", skip_all, err)]
+#[instrument(target = COMPONENT, skip_all, err)]
 pub fn apply_migrations(conn: &mut Connection) -> super::Result<()> {
     let version_before = MIGRATIONS.current_version(conn)?;