chore: improve logging

Author: neithanmo

crates/monitor/src/escrow_accounts.rs

@@ -172,11 +172,6 @@ async fn get_escrow_accounts_v2(
 
     let response = response?;
 
-    tracing::trace!(
-        "V2 escrow accounts raw response: {} accounts from network subgraph",
-        response.payments_escrow_accounts.len()
-    );
-
     // V2 TAP receipts use different field names (payer/service_provider) but the underlying
     // escrow account model is identical to V1. Both V1 and V2 receipts reference the same
     // sender addresses and the same escrow relationships.
@@ -228,12 +223,6 @@ async fn get_escrow_accounts_v2(
 
     let escrow_accounts = EscrowAccounts::new(senders_balances.clone(), senders_to_signers.clone());
 
-    tracing::trace!(
-        "V2 escrow accounts loaded: {} payers, {} signer->payer mappings",
-        senders_balances.len(),
-        escrow_accounts.signers_to_senders.len()
-    );
-
     Ok(escrow_accounts)
 }
 
@@ -242,11 +231,8 @@ async fn get_escrow_accounts_v1(
     indexer_address: Address,
     reject_thawing_signers: bool,
 ) -> anyhow::Result<EscrowAccounts> {
-    tracing::debug!(
-        "Loading V1 escrow accounts for indexer {}, reject_thawing_signers: {}",
-        indexer_address,
-        reject_thawing_signers
-    );
+    tracing::debug!(?indexer_address, "Loading V1 escrow accounts for indexer");
+
     // thawEndTimestamp == 0 means that the signer is not thawing. This also means
     // that we don't wait for the thawing period to end before stopping serving
     // queries for this signer.
@@ -265,11 +251,6 @@ async fn get_escrow_accounts_v1(
 
     let response = response?;
 
-    tracing::debug!(
-        "V1 escrow accounts raw response: {} accounts from subgraph",
-        response.escrow_accounts.len()
-    );
-
     let senders_balances: HashMap<Address, U256> = response
         .escrow_accounts
         .iter()

crates/service/src/service.rs

@@ -90,9 +90,6 @@ pub async fn run() -> anyhow::Result<()> {
     let database =
         database::connect(config.database.clone().get_formated_postgres_url().as_ref()).await;
 
-    // FIXME: V1 and V2 domains separator use their own smart contract verifier
-    // We need to add a new additional verifier address for V1, the current in pplace here
-    // is assume to be for horizon
     let domain_separator = tap_eip712_domain(
         config.blockchain.chain_id as u64,
         config.blockchain.receipts_verifier_address,

crates/service/src/service/tap_receipt_header.rs

@@ -31,10 +31,6 @@ impl Header for TapHeader {
     {
         let mut execute = || -> anyhow::Result<TapHeader> {
             let raw_receipt = values.next().ok_or(headers::Error::invalid())?;
-            tracing::debug!(
-                raw_receipt_length = raw_receipt.len(),
-                "Processing TAP receipt header"
-            );
 
             // we first try to decode a v2 receipt since it's cheaper and fail earlier than using
             // serde
@@ -69,9 +65,15 @@ impl Header for TapHeader {
                 }
             }
         };
-        execute()
-            .map_err(|_| headers::Error::invalid())
-            .inspect_err(|_| TAP_RECEIPT_INVALID.inc())
+        let result = execute();
+        match &result {
+            Ok(_) => {}
+            Err(e) => {
+                tracing::debug!(error = %e, "TAP receipt header parsing failed - detailed error before collapse");
+                TAP_RECEIPT_INVALID.inc();
+            }
+        }
+        result.map_err(|_| headers::Error::invalid())
     }
 
     fn encode<E>(&self, _values: &mut E)

crates/tap-agent/src/agent/sender_allocation.rs

@@ -605,6 +605,26 @@ where
                     .map(|r| r.signed_receipt().clone())
                     .collect();
 
+                // Instrumentation: log details before calling the aggregator
+                let receipt_count = valid_receipts.len();
+                let first_signer = valid_receipts.get(0).and_then(|r| match r {
+                    indexer_receipt::TapReceipt::V1(sr) => {
+                        sr.recover_signer(&self.domain_separator).ok()
+                    }
+                    indexer_receipt::TapReceipt::V2(sr) => {
+                        sr.recover_signer(&self.domain_separator).ok()
+                    }
+                });
+                tracing::info!(
+                    sender = %self.sender,
+                    allocation_id = %self.allocation_id,
+                    receipt_count,
+                    has_previous_rav = previous_rav.is_some(),
+                    signer_recovered = first_signer.is_some(),
+                    agent_domain = ?self.domain_separator,
+                    "Sending RAV aggregation request"
+                );
+
                 let rav_response_time_start = Instant::now();
 
                 let signed_rav =