Merge pull request #114 from EspressoSystems/jh/log

Clean the log with the log helper

Author: ImJeremyHe

Diff for: arbos/log_helper.go

@@ -0,0 +1,31 @@
+package arbos
+
+import (
+	"fmt"
+
+	log_helper "github.com/EspressoSystems/espresso-sequencer-go/log-helper"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+var (
+	logHelper                = log_helper.NewLogger()
+	channelFetchHeader       = log_helper.Channel("fetch header channel")
+	channelFetchTransactions = log_helper.Channel("fetch transactions channel")
+)
+
+func init() {
+	logHelper.AddLogAfterRetryStrategy(channelFetchHeader, "0", 20)
+	logHelper.AddLogAfterRetryStrategy(channelFetchTransactions, "0", 20)
+}
+
+func LogFailedToFetchHeader(block uint64) {
+	logHelper.Attempt(channelFetchHeader, fmt.Sprintf("%d", block), func() {
+		log.Warn("Unable to fetch header for block number, will retry", "block_num", block)
+	})
+}
+
+func LogFailedToFetchTransactions(block uint64, err error) {
+	logHelper.Attempt(channelFetchHeader, fmt.Sprintf("%d", block), func() {
+		log.Error("Error fetching transactions", "block", block, "err", err)
+	})
+}

Diff for: execution/gethexec/espresso_sequencer.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"time"
 
+	"github.com/offchainlabs/nitro/arbos"
 	"github.com/offchainlabs/nitro/util/stopwaiter"
 
 	espressoClient "github.com/EspressoSystems/espresso-sequencer-go/client"
@@ -73,12 +74,12 @@ func (s *EspressoSequencer) createBlock(ctx context.Context) (returnValue bool)
 	nextSeqBlockNum := s.hotShotState.nextSeqBlockNum
 	header, err := s.hotShotState.client.FetchHeaderByHeight(ctx, nextSeqBlockNum)
 	if err != nil {
-		log.Warn("Unable to fetch header for block number, will retry", "block_num", nextSeqBlockNum)
+		arbos.LogFailedToFetchHeader(nextSeqBlockNum)
 		return false
 	}
 	arbTxns, err := s.hotShotState.client.FetchTransactionsInBlock(ctx, header.Height, s.namespace)
 	if err != nil {
-		log.Error("Error fetching transactions", "err", err)
+		arbos.LogFailedToFetchTransactions(header.Height, err)
 		return false
 	}
 

Diff for: execution/gethexec/switch_sequencer.go

@@ -64,7 +64,7 @@ func (s *SwitchSequencer) SwitchToEspresso(ctx context.Context) error {
 	if s.IsRunningEspressoMode() {
 		return nil
 	}
-	log.Info("Switching to espresso sequencer")
+	log.Info("Switching to espresso sequencer", "max hotshot drift time", s.maxHotShotDriftTime)
 
 	s.mode = SequencingMode_Espresso
 
@@ -77,7 +77,7 @@ func (s *SwitchSequencer) SwitchToCentralized(ctx context.Context) error {
 		return nil
 	}
 	s.mode = SequencingMode_Centralized
-	log.Info("Switching to centrialized sequencer")
+	log.Warn("Switching to centrialized sequencer", "max hotshot drift time", s.maxHotShotDriftTime)
 
 	s.espresso.StopAndWait()
 	return s.centralized.Start(ctx)