uncomment snapshot logging, defer json encoding

op-node/node/node.go

@@ -144,8 +144,7 @@ func (n *OpNode) initL2(ctx context.Context, cfg *Config, snapshotLog log.Logger
 		return err
 	}
 
-	snap := snapshotLog.New()
-	n.l2Engine = driver.NewDriver(&cfg.Driver, &cfg.Rollup, source, n.l1Source, n, n.log, snap)
+	n.l2Engine = driver.NewDriver(&cfg.Driver, &cfg.Rollup, source, n.l1Source, n, n.log, snapshotLog)
 
 	return nil
 }

op-node/rollup/driver/state.go

@@ -2,6 +2,7 @@ package driver
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	gosync "sync"
@@ -341,18 +342,22 @@ func (s *state) eventLoop() {
 	}
 }
 
+// deferJSONString helps avoid a JSON-encoding performance hit if the snapshot logger does not run
+type deferJSONString struct {
+	x any
+}
+
+func (v deferJSONString) String() string {
+	out, _ := json.Marshal(v.x)
+	return string(out)
+}
+
 func (s *state) snapshot(event string) {
-	// l1HeadJSON, _ := json.Marshal(s.l1Head)
-	// l1CurrentJSON, _ := json.Marshal(s.derivation.CurrentL1())
-	// l2HeadJSON, _ := json.Marshal(s.l2Head)
-	// l2SafeHeadJSON, _ := json.Marshal(s.l2SafeHead)
-	// l2FinalizedHeadJSON, _ := json.Marshal(s.l2Finalized)
-
-	// s.snapshotLog.Info("Rollup State Snapshot",
-	// 	"event", event,
-	// 	"l1Head", string(l1HeadJSON),
-	// 	"l1Current", string(l1CurrentJSON),
-	// 	"l2Head", string(l2HeadJSON),
-	// 	"l2SafeHead", string(l2SafeHeadJSON),
-	// 	"l2FinalizedHead", string(l2FinalizedHeadJSON))
+	s.snapshotLog.Info("Rollup State Snapshot",
+		"event", event,
+		"l1Head", deferJSONString{s.l1Head},
+		"l1Current", deferJSONString{s.derivation.Progress().Origin},
+		"l2Head", deferJSONString{s.l2Head},
+		"l2SafeHead", deferJSONString{s.l2SafeHead},
+		"l2FinalizedHead", deferJSONString{s.l2Finalized})
 }

op-node/service.go

@@ -161,8 +161,8 @@ func NewSnapshotLogger(ctx *cli.Context) (log.Logger, error) {
 		if err != nil {
 			return nil, err
 		}
-	}
 		handler = log.SyncHandler(handler)
+	}
 	logger := log.New()
 	logger.SetHandler(handler)
 	return logger, nil