op-e2e,op-service: set global default logger for tests

op-e2e/config/init.go

@@ -10,10 +10,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
-	"github.com/ethereum-optimism/optimism/op-e2e/external"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
+	"github.com/ethereum-optimism/optimism/op-e2e/external"
 )
 
 var (
@@ -59,7 +61,7 @@ func init() {
 	flag.StringVar(&l1DeploymentsPath, "l1-deployments", defaultL1DeploymentsPath, "")
 	flag.StringVar(&deployConfigPath, "deploy-config", defaultDeployConfigPath, "")
 	flag.StringVar(&externalL2, "externalL2", "", "Enable tests with external L2")
-	flag.IntVar(&EthNodeVerbosity, "ethLogVerbosity", 3, "The level of verbosity to use for the eth node logs")
+	flag.IntVar(&EthNodeVerbosity, "ethLogVerbosity", int(log.LvlInfo), "The level of verbosity to use for the eth node logs")
 	testing.Init() // Register test flags before parsing
 	flag.Parse()
 

op-e2e/helper.go

@@ -4,8 +4,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-e2e/config"
 	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-e2e/config"
+	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	"github.com/ethereum-optimism/optimism/op-service/testlog"
 )
 
 var enableParallelTesting bool = os.Getenv("OP_E2E_DISABLE_PARALLEL") != "true"
@@ -15,7 +18,12 @@ func InitParallel(t *testing.T) {
 	if enableParallelTesting {
 		t.Parallel()
 	}
-	if config.EthNodeVerbosity < 0 {
+	lvl := log.Lvl(config.EthNodeVerbosity)
+	if lvl < log.LvlCrit {
 		log.Root().SetHandler(log.DiscardHandler())
+	} else if lvl > log.LvlTrace { // clip to trace level
+		lvl = log.LvlTrace
 	}
+	h := testlog.Handler(t, lvl, log.TerminalFormat(false)) // some CI logs do not handle colors well
+	oplog.SetGlobalLogHandler(h)
 }

op-service/log/cli.go

@@ -148,12 +148,18 @@ func AppOut(ctx *cli.Context) io.Writer {
 	return ctx.App.Writer
 }
 
-// NewLogger creates a new configured logger.
-// The log handler of the logger is a LvlSetter, i.e. the log level can be changed as needed.
-func NewLogger(wr io.Writer, cfg CLIConfig) log.Logger {
+// NewLogHandler creates a new configured handler, compatible as LvlSetter for log-level changes during runtime.
+func NewLogHandler(wr io.Writer, cfg CLIConfig) log.Handler {
 	handler := log.StreamHandler(wr, cfg.Format.Formatter(cfg.Color))
 	handler = log.SyncHandler(handler)
 	handler = NewDynamicLogHandler(cfg.Level, handler)
+	return handler
+}
+
+// NewLogger creates a new configured logger.
+// The log handler of the logger is a LvlSetter, i.e. the log level can be changed as needed.
+func NewLogger(wr io.Writer, cfg CLIConfig) log.Logger {
+	handler := NewLogHandler(wr, cfg)
 	logger := log.New()
 	logger.SetHandler(handler)
 	return logger

op-service/testlog/testlog.go

@@ -43,8 +43,8 @@ type Testing interface {
 }
 
 // Handler returns a log handler which logs to the unit test log of t.
-func Handler(t Testing, level log.Lvl) log.Handler {
-	return log.LvlFilterHandler(level, &handler{t, log.TerminalFormat(false)})
+func Handler(t Testing, level log.Lvl, format log.Format) log.Handler {
+	return log.LvlFilterHandler(level, &handler{t, format})
 }
 
 type handler struct {