chore: cleanup metric emission labels (#1004)

* chore: cleanup metric emission labels * Apply suggestions from code review Co-authored-by: Yi Sun <[email protected]> --------- Co-authored-by: Yi Sun <[email protected]>
openvm-org · Dec 12, 2024 · 93a0a33 · 93a0a33
1 parent 0c37b68
commit 93a0a33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/crates/axvm-sdk/src/prover/agg.rs b/crates/axvm-sdk/src/prover/agg.rs
@@ -142,7 +142,7 @@ impl AggStarkProver {
                 &proofs,
                 self.num_children_internal,
             );
-            let group = format!("internal_verifier_height_{}", internal_node_height);
+            let group = format!("internal_{}", internal_node_height);
             proofs = info_span!("internal verifier", group = group).in_scope(|| {
                 #[cfg(feature = "bench-metrics")]
                 metrics::counter!("fri.log_blowup")
@@ -153,8 +153,8 @@ impl AggStarkProver {
                         internal_node_idx += 1;
                         info_span!(
                             "Internal verifier proof",
-                            index = internal_node_idx,
-                            height = internal_node_height
+                            idx = internal_node_idx,
+                            hgt = internal_node_height
                         )
                         .in_scope(|| {
                             single_segment_prove(&self.internal_prover, input.write(), self.profile)
@@ -168,7 +168,7 @@ impl AggStarkProver {
     }
 
     fn generate_root_proof_impl(&self, root_input: RootVmVerifierInput<SC>) -> Proof<RootSC> {
-        info_span!("root verifier", group = "root_verifier").in_scope(|| {
+        info_span!("root verifier", group = "root").in_scope(|| {
             let input = root_input.write();
             #[cfg(feature = "bench-metrics")]
             metrics::counter!("fri.log_blowup").absolute(
@@ -220,7 +220,7 @@ impl LeafProver {
         self
     }
     pub fn generate_proof(&self, app_proofs: &ContinuationVmProof<SC>) -> Vec<Proof<SC>> {
-        info_span!("leaf verifier", group = "leaf_verifier").in_scope(|| {
+        info_span!("leaf verifier", group = "leaf").in_scope(|| {
             #[cfg(feature = "bench-metrics")]
             metrics::counter!("fri.log_blowup")
                 .absolute(self.prover.pk.fri_params.log_blowup as u64);
@@ -232,7 +232,7 @@ impl LeafProver {
                 .into_iter()
                 .enumerate()
                 .map(|(leaf_node_idx, input)| {
-                    info_span!("leaf verifier proof", index = leaf_node_idx).in_scope(|| {
+                    info_span!("leaf verifier proof", idx = leaf_node_idx).in_scope(|| {
                         single_segment_prove(&self.prover, input.write_to_stream(), self.profile)
                     })
                 })

diff --git a/crates/axvm-sdk/src/prover/halo2.rs b/crates/axvm-sdk/src/prover/halo2.rs
@@ -34,12 +34,12 @@ impl Halo2Prover {
     pub fn prove_for_evm(&self, root_proof: &Proof<RootSC>) -> EvmProof {
         let mut witness = Witness::default();
         root_proof.write(&mut witness);
-        let snark = info_span!("halo2 verifier", group = "halo2_verifier").in_scope(|| {
+        let snark = info_span!("halo2 outer recursion", group = "halo2_outer").in_scope(|| {
             self.halo2_pk
                 .verifier
                 .prove_with_loaded_params(&self.verifier_srs, witness)
         });
-        info_span!("halo2 wrapper", group = "halo2_wrapper").in_scope(|| {
+        info_span!("halo2_wrapper", group = "halo2_wrapper").in_scope(|| {
             self.halo2_pk
                 .wrapper
                 .prove_for_evm_with_loaded_params(&self.wrapper_srs, snark)

diff --git a/crates/vm/src/arch/vm.rs b/crates/vm/src/arch/vm.rs
@@ -484,8 +484,7 @@ where
         pk: &MultiStarkProvingKey<SC>,
         proof_input: ProofInput<SC>,
     ) -> Proof<SC> {
-        tracing::info_span!("prove_segment", segment = 0)
-            .in_scope(|| self.engine.prove(pk, proof_input))
+        self.engine.prove(pk, proof_input)
     }
 
     pub fn prove(