feat: use zap.AtomicLevel for dynamic logging levels (#26182) (#26826)

devanbenz · davidby-influx · web-flow · commit a743838f9d5d · 2025-09-23T17:37:39.000-05:00
Co-authored-by: davidby-influx &lt;72418212+davidby-influx@users.noreply.github.com&gt;
diff --git a/cmd/influx_inspect/verify/seriesfile/command.go b/cmd/influx_inspect/verify/seriesfile/command.go
@@ -55,9 +55,9 @@ func (cmd *Command) Run(args ...string) error {
 	}
 
 	config := logger.NewConfig()
-	config.Level = zapcore.WarnLevel
+	config.Level.SetLevel(zapcore.WarnLevel)
 	if cmd.verbose {
-		config.Level = zapcore.InfoLevel
+		config.Level.SetLevel(zapcore.InfoLevel)
 	}
 	logger, err := config.New(cmd.Stderr)
 	if err != nil {
diff --git a/cmd/influx_tools/compact/command.go b/cmd/influx_tools/compact/command.go
@@ -59,7 +59,7 @@ func (cmd *Command) Run(args []string) (err error) {
 
 	var log = zap.NewNop()
 	if cmd.verbose {
-		cfg := logger.Config{Format: "logfmt", Level: zapcore.DebugLevel}
+		cfg := logger.Config{Format: "logfmt", Level: zap.NewAtomicLevelAt(zapcore.DebugLevel)}
 		log, err = cfg.New(os.Stdout)
 		if err != nil {
 			return err
diff --git a/cmd/influxd/run/config_test.go b/cmd/influxd/run/config_test.go
@@ -228,7 +228,7 @@ min-version = "tls1.0"
 		t.Fatalf("unexpected cache max memory size: %v", c.Data.CacheMaxMemorySize)
 	}
 
-	if c.Logging.Level != zapcore.WarnLevel {
+	if c.Logging.Level.Level() != zapcore.WarnLevel {
 		t.Fatalf("unexpected logging level: %v", c.Logging.Level)
 	}
 
diff --git a/logger/config.go b/logger/config.go
@@ -1,20 +1,20 @@
 package logger
 
 import (
-	"go.uber.org/zap/zapcore"
+	"go.uber.org/zap"
 )
 
 // Config represents the configuration for creating a zap.Logger.
 type Config struct {
-	Format       string        `toml:"format"`
-	Level        zapcore.Level `toml:"level"`
-	SuppressLogo bool          `toml:"suppress-logo"`
+	Format       string          `toml:"format"`
+	Level        zap.AtomicLevel `toml:"level"`
+	SuppressLogo bool            `toml:"suppress-logo"`
 }
 
 // NewConfig returns a new instance of Config with defaults.
 func NewConfig() Config {
 	return Config{
 		Format: "auto",
-		Level:  zapcore.InfoLevel,
+		Level:  zap.NewAtomicLevel(),
 	}
 }
diff --git a/toml/toml_test.go b/toml/toml_test.go
@@ -141,10 +141,10 @@ func TestGroup_UnmarshalTOML(t *testing.T) {
 }
 
 func TestConfig_Encode(t *testing.T) {
-	var c run.Config
+	var c *run.Config = run.NewConfig()
 	c.Coordinator.WriteTimeout = itoml.Duration(time.Minute)
 	buf := new(bytes.Buffer)
-	if err := toml.NewEncoder(buf).Encode(&c); err != nil {
+	if err := toml.NewEncoder(buf).Encode(c); err != nil {
 		t.Fatal("Failed to encode: ", err)
 	}
 	got, search := buf.String(), `write-timeout = "1m0s"`

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ func (cmd *Command) Run(args ...string) error {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`config := logger.NewConfig()`
`58`		`- config.Level = zapcore.WarnLevel`
	`58`	`+ config.Level.SetLevel(zapcore.WarnLevel)`
`59`	`59`	`if cmd.verbose {`
`60`		`- config.Level = zapcore.InfoLevel`
	`60`	`+ config.Level.SetLevel(zapcore.InfoLevel)`
`61`	`61`	`}`
`62`	`62`	`logger, err := config.New(cmd.Stderr)`
`63`	`63`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ min-version = "tls1.0"`
`228`	`228`	`t.Fatalf("unexpected cache max memory size: %v", c.Data.CacheMaxMemorySize)`
`229`	`229`	`}`
`230`	`230`
`231`		`- if c.Logging.Level != zapcore.WarnLevel {`
	`231`	`+ if c.Logging.Level.Level() != zapcore.WarnLevel {`
`232`	`232`	`t.Fatalf("unexpected logging level: %v", c.Logging.Level)`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`package logger`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "go.uber.org/zap/zapcore"`
	`4`	`+ "go.uber.org/zap"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// Config represents the configuration for creating a zap.Logger.`
`8`	`8`	`type Config struct {`
`9`		- Format string `toml:"format"`
`10`		- Level zapcore.Level `toml:"level"`
`11`		- SuppressLogo bool `toml:"suppress-logo"`
	`9`	+ Format string `toml:"format"`
	`10`	+ Level zap.AtomicLevel `toml:"level"`
	`11`	+ SuppressLogo bool `toml:"suppress-logo"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// NewConfig returns a new instance of Config with defaults.`
`15`	`15`	`func NewConfig() Config {`
`16`	`16`	`return Config{`
`17`	`17`	`Format: "auto",`
`18`		`- Level: zapcore.InfoLevel,`
	`18`	`+ Level: zap.NewAtomicLevel(),`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ func TestGroup_UnmarshalTOML(t *testing.T) {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`func TestConfig_Encode(t *testing.T) {`
`144`		`- var c run.Config`
	`144`	`+ var c *run.Config = run.NewConfig()`
`145`	`145`	`c.Coordinator.WriteTimeout = itoml.Duration(time.Minute)`
`146`	`146`	`buf := new(bytes.Buffer)`
`147`		`- if err := toml.NewEncoder(buf).Encode(&c); err != nil {`
	`147`	`+ if err := toml.NewEncoder(buf).Encode(c); err != nil {`
`148`	`148`	`t.Fatal("Failed to encode: ", err)`
`149`	`149`	`}`
`150`	`150`	got, search := buf.String(), `write-timeout = "1m0s"`