Sitelet https://github.com/ethereum-optimism/optimism/commit/f90ec530598b9a4e7cd19d6ce459c4820464346b
Skip to content

Commit f90ec53

Browse files
sebastianstclaude
sebastianst
and
claude
authored
op-service/log!: make op-service/log a leaf package and the monorepo's logger surface (#23013)
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent 5315305 commit f90ec53

197 files changed

Lines changed: 803 additions & 543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎op-alt-da/cmd/daserver/entrypoint.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
altda "github.com/ethereum-optimism/optimism/op-alt-da"
99
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
10-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
10+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1111
)
1212

1313
func StartDAServer(cliCtx *cli.Context) error {
@@ -20,10 +20,10 @@ func StartDAServer(cliCtx *cli.Context) error {
2020
return err
2121
}
2222

23-
logCfg := oplog.ReadCLIConfig(cliCtx)
23+
logCfg := logcli.ReadCLIConfig(cliCtx)
2424

25-
l := oplog.NewLogger(oplog.AppOut(cliCtx), logCfg)
26-
oplog.SetGlobalLogHandler(l.Handler())
25+
l := logcli.NewLogger(logcli.AppOut(cliCtx), logCfg)
26+
logcli.SetGlobalLogHandler(l.Handler())
2727

2828
l.Info("Initializing AltDA server...")
2929

‎op-alt-da/cmd/daserver/flags.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/urfave/cli/v2"
88

99
opservice "github.com/ethereum-optimism/optimism/op-service"
10-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
10+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1111
)
1212

1313
const (
@@ -91,7 +91,7 @@ var optionalFlags = []cli.Flag{
9191
}
9292

9393
func init() {
94-
optionalFlags = append(optionalFlags, oplog.CLIFlags(EnvVarPrefix)...)
94+
optionalFlags = append(optionalFlags, logcli.CLIFlags(EnvVarPrefix)...)
9595
Flags = append(requiredFlags, optionalFlags...)
9696
}
9797

‎op-alt-da/cmd/daserver/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
opservice "github.com/ethereum-optimism/optimism/op-service"
1111
"github.com/ethereum-optimism/optimism/op-service/cliapp"
1212
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
13-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
13+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1414
)
1515

1616
var Version = "v0.0.0"
1717

1818
func main() {
19-
oplog.SetupDefaults()
19+
logcli.SetupDefaults()
2020

2121
app := cli.NewApp()
2222
app.Flags = cliapp.ProtectFlags(Flags)

‎op-batcher/batcher/batch_submitter.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/ethereum-optimism/optimism/op-batcher/flags"
1010
opservice "github.com/ethereum-optimism/optimism/op-service"
1111
"github.com/ethereum-optimism/optimism/op-service/cliapp"
12-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
12+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1313
)
1414

1515
// Main is the entrypoint into the Batch Submitter.
@@ -24,8 +24,8 @@ func Main(version string) cliapp.LifecycleAction {
2424
return nil, fmt.Errorf("invalid CLI flags: %w", err)
2525
}
2626

27-
l := oplog.NewLogger(oplog.AppOut(cliCtx), cfg.LogConfig)
28-
oplog.SetGlobalLogHandler(l.Handler())
27+
l := logcli.NewLogger(logcli.AppOut(cliCtx), cfg.LogConfig)
28+
logcli.SetGlobalLogHandler(l.Handler())
2929
opservice.ValidateEnvVars(flags.EnvVarPrefix, flags.Flags, l)
3030

3131
l.Info("Initializing Batch Submitter")

‎op-batcher/batcher/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/ethereum-optimism/optimism/op-batcher/config"
1414
"github.com/ethereum-optimism/optimism/op-batcher/flags"
1515
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
16-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
16+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1717
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
1818
"github.com/ethereum-optimism/optimism/op-service/oppprof"
1919
oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
@@ -147,7 +147,7 @@ type CLIConfig struct {
147147
ThrottleConfig ThrottleConfig
148148

149149
TxMgrConfig txmgr.CLIConfig
150-
LogConfig oplog.CLIConfig
150+
LogConfig logcli.CLIConfig
151151
MetricsConfig opmetrics.CLIConfig
152152
PprofConfig oppprof.CLIConfig
153153
RPC oprpc.CLIConfig
@@ -243,7 +243,7 @@ func NewConfig(ctx *cli.Context) *CLIConfig {
243243
DataAvailabilityType: flags.DataAvailabilityType(ctx.String(flags.DataAvailabilityTypeFlag.Name)),
244244
ActiveSequencerCheckDuration: ctx.Duration(flags.ActiveSequencerCheckDurationFlag.Name),
245245
TxMgrConfig: txmgr.ReadCLIConfig(ctx),
246-
LogConfig: oplog.ReadCLIConfig(ctx),
246+
LogConfig: logcli.ReadCLIConfig(ctx),
247247
MetricsConfig: opmetrics.ReadCLIConfig(ctx),
248248
PprofConfig: oppprof.ReadCLIConfig(ctx),
249249
RPC: oprpc.ReadCLIConfig(ctx),

‎op-batcher/batcher/config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/ethereum-optimism/optimism/op-batcher/compressor"
1010
"github.com/ethereum-optimism/optimism/op-batcher/flags"
1111
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
12-
"github.com/ethereum-optimism/optimism/op-service/log"
12+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1313
"github.com/ethereum-optimism/optimism/op-service/metrics"
1414
"github.com/ethereum-optimism/optimism/op-service/oppprof"
1515
"github.com/ethereum-optimism/optimism/op-service/rpc"
@@ -34,7 +34,7 @@ func validBatcherConfig() batcher.CLIConfig {
3434
BatchType: 0,
3535
DataAvailabilityType: flags.CalldataType,
3636
TxMgrConfig: txmgr.NewCLIConfig("fake", txmgr.DefaultBatcherFlagValues),
37-
LogConfig: log.DefaultCLIConfig(),
37+
LogConfig: logcli.DefaultCLIConfig(),
3838
MetricsConfig: metrics.DefaultCLIConfig(),
3939
PprofConfig: oppprof.DefaultCLIConfig(),
4040
// The compressor config is not checked in config.Check()

‎op-batcher/cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
opservice "github.com/ethereum-optimism/optimism/op-service"
1313
"github.com/ethereum-optimism/optimism/op-service/cliapp"
1414
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
15-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
15+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1616
"github.com/ethereum-optimism/optimism/op-service/metrics/doc"
1717
"github.com/ethereum/go-ethereum/log"
1818
)
@@ -24,7 +24,7 @@ var (
2424
)
2525

2626
func main() {
27-
oplog.SetupDefaults()
27+
logcli.SetupDefaults()
2828

2929
app := cli.NewApp()
3030
app.Flags = cliapp.ProtectFlags(flags.Flags)

‎op-batcher/flags/flags.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
1414
opservice "github.com/ethereum-optimism/optimism/op-service"
1515
openum "github.com/ethereum-optimism/optimism/op-service/enum"
16-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
16+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
1717
opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
1818
"github.com/ethereum-optimism/optimism/op-service/oppprof"
1919
oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
@@ -192,7 +192,7 @@ var optionalFlags = []cli.Flag{
192192
func init() {
193193
optionalFlags = append(optionalFlags, ThrottleFlags...)
194194
optionalFlags = append(optionalFlags, oprpc.CLIFlags(EnvVarPrefix)...)
195-
optionalFlags = append(optionalFlags, oplog.CLIFlags(EnvVarPrefix)...)
195+
optionalFlags = append(optionalFlags, logcli.CLIFlags(EnvVarPrefix)...)
196196
optionalFlags = append(optionalFlags, opmetrics.CLIFlags(EnvVarPrefix)...)
197197
optionalFlags = append(optionalFlags, oppprof.CLIFlags(EnvVarPrefix)...)
198198
optionalFlags = append(optionalFlags, txmgr.CLIFlagsWithBTO(EnvVarPrefix)...)

‎op-chain-ops/cmd/check-jovian/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
op_service "github.com/ethereum-optimism/optimism/op-service"
2222
"github.com/ethereum-optimism/optimism/op-service/cliapp"
2323
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
24-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
24+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
2525
"github.com/ethereum-optimism/optimism/op-service/txmgr"
2626
"github.com/ethereum-optimism/optimism/op-service/txmgr/metrics"
2727
)
@@ -86,7 +86,7 @@ func makeFlags() []cli.Flag {
8686
EndpointL2,
8787
SecretKeyFlag,
8888
}
89-
return append(flags, oplog.CLIFlags(prefix)...)
89+
return append(flags, logcli.CLIFlags(prefix)...)
9090
}
9191

9292
func makeCommand(name string, fn CheckAction) *cli.Command {
@@ -99,8 +99,8 @@ func makeCommand(name string, fn CheckAction) *cli.Command {
9999

100100
func makeCommandAction(fn CheckAction) func(c *cli.Context) error {
101101
return func(c *cli.Context) error {
102-
logCfg := oplog.ReadCLIConfig(c)
103-
logger := oplog.NewLogger(c.App.Writer, logCfg)
102+
logCfg := logcli.ReadCLIConfig(c)
103+
logger := logcli.NewLogger(c.App.Writer, logCfg)
104104

105105
c.Context = ctxinterrupt.WithCancelOnInterrupt(c.Context)
106106
l2Cl, err := ethclient.DialContext(c.Context, c.String(EndpointL2.Name))

‎op-chain-ops/cmd/check-karst/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/ethereum-optimism/optimism/op-service/cliapp"
2525
"github.com/ethereum-optimism/optimism/op-service/ctxinterrupt"
2626
"github.com/ethereum-optimism/optimism/op-service/eth"
27-
oplog "github.com/ethereum-optimism/optimism/op-service/log"
27+
"github.com/ethereum-optimism/optimism/op-service/log/logcli"
2828
"github.com/ethereum-optimism/optimism/op-service/txplan"
2929
)
3030

@@ -64,7 +64,7 @@ var (
6464

6565
func makeFlags() []cli.Flag {
6666
flags := []cli.Flag{EndpointL2, AccountKey}
67-
return append(flags, oplog.CLIFlags(prefix)...)
67+
return append(flags, logcli.CLIFlags(prefix)...)
6868
}
6969

7070
// checkEnv bundles the resolved per-invocation inputs that every subcommand
@@ -84,8 +84,8 @@ func (e *checkEnv) close() {
8484
}
8585

8686
func resolveEnv(c *cli.Context) (*checkEnv, error) {
87-
logCfg := oplog.ReadCLIConfig(c)
88-
logger := oplog.NewLogger(c.App.Writer, logCfg)
87+
logCfg := logcli.ReadCLIConfig(c)
88+
logger := logcli.NewLogger(c.App.Writer, logCfg)
8989

9090
c.Context = ctxinterrupt.WithCancelOnInterrupt(c.Context)
9191
l2Cl, err := ethclient.DialContext(c.Context, c.String(EndpointL2.Name))

0 commit comments

Comments
 (0)