fix(coprocessor): move high-cardinality ids from child spans to log events and fix span correlation gap

Author: PanGan21

coprocessor/fhevm-engine/sns-worker/src/aws_upload.rs

@@ -537,10 +537,12 @@ async fn fetch_pending_uploads(
                 "recovery_task",
                 transaction_hash = transaction_id.as_deref().map(to_hex).unwrap_or_default(),
             );
-            info!(
-                handle = %to_hex(&handle),
-                "recovery task for handle"
-            );
+            recovery_span.in_scope(|| {
+                info!(
+                    handle = %to_hex(&handle),
+                    "recovery task for handle"
+                );
+            });
             let item = HandleItem {
                 host_chain_id: ChainId::try_from(row.host_chain_id)
                     .map_err(|e| ExecutionError::ConversionError(e.into()))?,

coprocessor/fhevm-engine/transaction-sender/src/ops/add_ciphertext.rs

@@ -41,11 +41,7 @@ impl<P> AddCiphertextOperation<P>
 where
     P: Provider<Ethereum> + Clone + 'static,
 {
-    #[tracing::instrument(
-        name = "call_add_ciphertext",
-        skip_all,
-        fields(transaction_hash = src_transaction_id.as_deref().map(to_hex).unwrap_or_default())
-    )]
+    #[tracing::instrument(name = "call_add_ciphertext", skip_all)]
     async fn send_transaction(
         &self,
         handle: &[u8],
@@ -56,7 +52,11 @@ where
     ) -> anyhow::Result<()> {
         let h = to_hex(handle);
 
-        info!(handle = h, "Processing transaction");
+        info!(
+            transaction_hash = src_transaction_id.as_deref().map(to_hex).unwrap_or_default(),
+            handle = h,
+            "Processing transaction"
+        );
 
         let receipt = match self
             .provider

coprocessor/fhevm-engine/transaction-sender/src/ops/verify_proof.rs

@@ -118,18 +118,18 @@ where
         Ok(())
     }
 
-    #[tracing::instrument(
-        name = "call_verify_proof_resp",
-        skip_all,
-        fields(transaction_hash = src_transaction_id.as_deref().map(to_hex).unwrap_or_default())
-    )]
+    #[tracing::instrument(name = "call_verify_proof_resp", skip_all)]
     async fn process_proof(
         &self,
         txn_request: (i64, impl Into<TransactionRequest>),
         current_retry_count: i32,
         src_transaction_id: Option<Vec<u8>>,
     ) -> anyhow::Result<()> {
-        info!(zk_proof_id = txn_request.0, "Processing transaction");
+        info!(
+            transaction_hash = src_transaction_id.as_deref().map(to_hex).unwrap_or_default(),
+            zk_proof_id = txn_request.0,
+            "Processing transaction"
+        );
 
         let receipt = match self
             .provider