logger: add timestamp config option (#3105)

Closes #3067.

Author: roman-khimov

CHANGELOG.md

@@ -8,6 +8,7 @@ Changelog for NeoFS Node
 - First split-object part into the CLI output (#3064)
 - `neofs-cli control notary` with `list`, `request` and `sign` commands (#3059)
 - IR `fschain.consensus.keep_only_latest_state` and `fschain.consensus.remove_untraceable_blocks` config options (#3093)
+- `logger.timestamp` config option (#3105)
 
 ### Fixed
 - `neofs-cli object delete` command output (#3056)

cmd/neofs-ir/internal/validate/config.go

@@ -4,8 +4,9 @@ import "time"
 
 type validConfig struct {
 	Logger struct {
-		Level    string `mapstructure:"level"`
-		Encoding string `mapstructure:"encoding"`
+		Level     string `mapstructure:"level"`
+		Encoding  string `mapstructure:"encoding"`
+		Timestamp bool   `mapstructure:"timestamp"`
 	} `mapstructure:"logger"`
 
 	Wallet struct {

cmd/neofs-ir/main.go

@@ -67,7 +67,7 @@ func main() {
 	c.Level = logLevel
 	c.Encoding = cfg.GetString("logger.encoding")
 	c.Sampling = nil
-	if term.IsTerminal(int(os.Stdout.Fd())) {
+	if (term.IsTerminal(int(os.Stdout.Fd())) && !cfg.IsSet("logger.timestamp")) || cfg.GetBool("logger.timestamp") {
 		c.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	} else {
 		c.EncoderConfig.EncodeTime = func(_ time.Time, _ zapcore.PrimitiveArrayEncoder) {}

cmd/neofs-node/config.go

@@ -87,8 +87,9 @@ type applicationConfiguration struct {
 	_read bool
 
 	logger struct {
-		level    string
-		encoding string
+		level     string
+		encoding  string
+		timestamp bool
 	}
 
 	engine struct {
@@ -147,6 +148,7 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error {
 
 	a.logger.level = loggerconfig.Level(c)
 	a.logger.encoding = loggerconfig.Encoding(c)
+	a.logger.timestamp = loggerconfig.Timestamp(c)
 
 	// Policer
 
@@ -562,7 +564,7 @@ func initCfg(appCfg *config.Config) *cfg {
 	logCfg.Level = c.internals.logLevel
 	logCfg.Encoding = c.logger.encoding
 	logCfg.Sampling = nil
-	if term.IsTerminal(int(os.Stdout.Fd())) {
+	if (term.IsTerminal(int(os.Stdout.Fd())) && c.cfgReader.Value("logger.timestamp") == nil) || c.logger.timestamp {
 		logCfg.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	} else {
 		logCfg.EncoderConfig.EncodeTime = func(_ time.Time, _ zapcore.PrimitiveArrayEncoder) {}

cmd/neofs-node/config/internal/validate/config.go

@@ -6,8 +6,9 @@ import (
 
 type valideConfig struct {
 	Logger struct {
-		Level    string `mapstructure:"level"`
-		Encoding string `mapstructure:"encoding"`
+		Level     string `mapstructure:"level"`
+		Encoding  string `mapstructure:"encoding"`
+		Timestamp bool   `mapstructure:"timestamp"`
 	} `mapstructure:"logger"`
 
 	Pprof struct {

cmd/neofs-node/config/logger/config.go

@@ -43,3 +43,14 @@ func Encoding(c *config.Config) string {
 
 	return EncodingDefault
 }
+
+// Timestamp returns the value of "timestamp" config parameter
+// from "logger" section.
+//
+// Returns false if the value is missing or invalid.
+func Timestamp(c *config.Config) bool {
+	return config.BoolSafe(
+		c.Sub("logger"),
+		"timestamp",
+	)
+}

cmd/neofs-node/config/logger/config_test.go

@@ -14,6 +14,7 @@ func TestLoggerSection_Level(t *testing.T) {
 		emptyConfig := configtest.EmptyConfig()
 		require.Equal(t, loggerconfig.LevelDefault, loggerconfig.Level(emptyConfig))
 		require.Equal(t, loggerconfig.EncodingDefault, loggerconfig.Encoding(emptyConfig))
+		require.False(t, loggerconfig.Timestamp(emptyConfig))
 	})
 
 	const path = "../../../../config/example/node"

config/example/ir.env

@@ -1,5 +1,6 @@
 NEOFS_IR_LOGGER_LEVEL=info
 NEOFS_IR_LOGGER_ENCODING=console
+NEOFS_IR_LOGGER_TIMESTAMP=false
 
 NEOFS_IR_WALLET_PATH=/path/to/wallet.json
 NEOFS_IR_WALLET_ADDRESS=NUHtW3eM6a4mmFCgyyr4rj4wygsTKB88XX

config/example/ir.yaml

@@ -3,6 +3,8 @@
 logger:
   level: info # Logger level: one of "debug", "info" (default), "warn", "error", "dpanic", "panic", "fatal"
   encoding: console # Logger encoding: one of "console" (default) or "json"
+  timestamp: false # turn on/off timestamps. By default, timestamps are disabled,
+    # but if the parameter is not set, they will be enabled when you run with tty)
 
 wallet:
   path: /path/to/wallet.json                  # Path to NEP-6 NEO wallet file

config/example/node.env

@@ -1,5 +1,6 @@
 NEOFS_LOGGER_LEVEL=debug
 NEOFS_LOGGER_ENCODING=json
+NEOFS_LOGGER_TIMESTAMP=true
 
 NEOFS_PPROF_ENABLED=true
 NEOFS_PPROF_ADDRESS=localhost:6060