From cbc5ec9385876065f313b8f35059431f3489f345 Mon Sep 17 00:00:00 2001
From: Jordan Hrycaj <jordan@status.im>
Date: Thu, 12 Dec 2024 17:35:10 +0000
Subject: [PATCH] Beacon sync logging updates (#2930)

* Cosmetics, add some metrics updates to smoothen curves

why:
  Progress downloading blocks was just a jump from none to full

* Reclassifying some syncer gossip from TRC to DBG

why:
  Might help debugging without full trace logs
---
 nimbus/sync/beacon/worker/blocks_staged.nim |  3 +++
 nimbus/sync/beacon/worker/update.nim        | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nimbus/sync/beacon/worker/blocks_staged.nim b/nimbus/sync/beacon/worker/blocks_staged.nim
index bdcb9e24d..eded44e4f 100644
--- a/nimbus/sync/beacon/worker/blocks_staged.nim
+++ b/nimbus/sync/beacon/worker/blocks_staged.nim
@@ -187,6 +187,9 @@ proc blocksStagedCollect*(
       # response length from the network.
       nBlkBlocks = blk.blocks.len
 
+    # Update, so it can be followed nicely
+    ctx.updateMetrics()
+
     # Fetch and extend staging record
     if not await buddy.fetchAndCheck(ivReq, blk, info):
 
diff --git a/nimbus/sync/beacon/worker/update.nim b/nimbus/sync/beacon/worker/update.nim
index 76870ce5a..b81075394 100644
--- a/nimbus/sync/beacon/worker/update.nim
+++ b/nimbus/sync/beacon/worker/update.nim
@@ -25,7 +25,7 @@ import
 # Private functions
 # ------------------------------------------------------------------------------
 
-func syncState(ctx: BeaconCtxRef; info: static[string]): SyncLayoutState =
+proc syncState(ctx: BeaconCtxRef; info: static[string]): SyncLayoutState =
   ## Calculate `SyncLayoutState` from the download context
 
   let
@@ -98,7 +98,7 @@ func syncState(ctx: BeaconCtxRef; info: static[string]): SyncLayoutState =
   #                        o---------------------o----------------o
   #                        | <-- unprocessed --> | <-- linked --> |
   #
-  trace info & ": inconsistent state",
+  debug info & ": inconsistent state",
     B=(if b == c: "C" else: b.bnStr),
     C=(if c == l: "L" else: c.bnStr),
     L=(if l == d: "D" else: l.bnStr),
@@ -121,7 +121,7 @@ proc startHibernating(ctx: BeaconCtxRef; info: static[string]) =
 
   ctx.hibernate = true
 
-  trace info & ": suspending syncer", L=ctx.chain.latestNumber.bnStr
+  debug info & ": suspending syncer", L=ctx.chain.latestNumber.bnStr
 
   # Update, so it can be followed nicely
   ctx.updateMetrics()
@@ -288,7 +288,7 @@ proc updateSyncState*(ctx: BeaconCtxRef; info: static[string]) =
     return
     # Notreached
 
-  trace info & ": sync state changed", prevState, thisState,
+  debug info & ": sync state changed", prevState, thisState,
     L=ctx.chain.latestNumber.bnStr,
     C=(if ctx.layout.coupler == ctx.layout.dangling: "D"
        else: ctx.layout.coupler.bnStr),
@@ -304,7 +304,7 @@ proc updateSyncState*(ctx: BeaconCtxRef; info: static[string]) =
      thisState == finishedHeaders and
      ctx.linkIntoFc(info):               # commit downloading headers
     ctx.setupProcessingBlocks info       # start downloading block bodies
-    trace info & ": sync state changed",
+    debug info & ": sync state changed",
       prevState=thisState, thisState=ctx.syncState(info)
     return
     # Notreached
@@ -338,7 +338,7 @@ proc updateFinalBlockHeader*(
     # Activate running (unless done yet)
     if ctx.hibernate:
       ctx.hibernate = false
-      trace info & ": activating syncer", B=b.bnStr,
+      debug info & ": activating syncer", B=b.bnStr,
         finalised=f.bnStr, head=ctx.target.consHead.bnStr
 
     # Update, so it can be followed nicely