forked from TrueCloudLab/frostfs-node
[#1619] logger: Filter entries by tags provided in config
Change-Id: Ia2a79d6cb2a5eb263fb2e6db3f9cf9f2a7d57118 Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
parent
e06ecacf57
commit
dfe2f9956a
8 changed files with 231 additions and 18 deletions
|
@ -4,12 +4,14 @@ import (
|
|||
"context"
|
||||
"os"
|
||||
"os/signal"
|
||||
"strconv"
|
||||
"syscall"
|
||||
|
||||
configViper "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common/config"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/internal/logs"
|
||||
control "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/control/ir"
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
|
||||
"github.com/spf13/cast"
|
||||
"github.com/spf13/viper"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
@ -44,11 +46,30 @@ func reloadConfig() error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
log.Reload(logPrm)
|
||||
err = logPrm.SetTags(loggerTags())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
logger.UpdateLevelForTags(logPrm)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func loggerTags() [][]string {
|
||||
var res [][]string
|
||||
for i := 0; ; i++ {
|
||||
var item []string
|
||||
index := strconv.FormatInt(int64(i), 10)
|
||||
names := cast.ToString(cfg.Get("logger.tags." + index + ".names"))
|
||||
if names == "" {
|
||||
break
|
||||
}
|
||||
item = append(item, names, cast.ToString(cfg.Get("logger.tags."+index+".level")))
|
||||
res = append(res, item)
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
func watchForSignal(ctx context.Context, cancel func()) {
|
||||
ch := make(chan os.Signal, 1)
|
||||
signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
|
||||
|
|
|
@ -80,10 +80,14 @@ func main() {
|
|||
exitErr(err)
|
||||
logPrm.SamplingHook = metrics.LogMetrics().GetSamplingHook()
|
||||
logPrm.PrependTimestamp = cfg.GetBool("logger.timestamp")
|
||||
err = logPrm.SetTags(loggerTags())
|
||||
exitErr(err)
|
||||
|
||||
log, err = logger.NewLogger(logPrm)
|
||||
exitErr(err)
|
||||
|
||||
logger.UpdateLevelForTags(logPrm)
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
pprofCmp = newPprofComponent()
|
||||
|
|
|
@ -109,6 +109,7 @@ type applicationConfiguration struct {
|
|||
destination string
|
||||
timestamp bool
|
||||
options []zap.Option
|
||||
tags [][]string
|
||||
}
|
||||
|
||||
ObjectCfg struct {
|
||||
|
@ -241,6 +242,7 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error {
|
|||
})}
|
||||
}
|
||||
a.LoggerCfg.options = opts
|
||||
a.LoggerCfg.tags = loggerconfig.Tags(c)
|
||||
|
||||
// Object
|
||||
|
||||
|
@ -727,6 +729,7 @@ func initCfg(appCfg *config.Config) *cfg {
|
|||
logPrm.SamplingHook = c.metricsCollector.LogMetrics().GetSamplingHook()
|
||||
log, err := logger.NewLogger(logPrm)
|
||||
fatalOnErr(err)
|
||||
logger.UpdateLevelForTags(logPrm)
|
||||
|
||||
c.internals = initInternals(appCfg, log)
|
||||
|
||||
|
@ -1094,6 +1097,11 @@ func (c *cfg) loggerPrm() (logger.Prm, error) {
|
|||
}
|
||||
prm.PrependTimestamp = c.LoggerCfg.timestamp
|
||||
prm.Options = c.LoggerCfg.options
|
||||
err = prm.SetTags(c.LoggerCfg.tags)
|
||||
if err != nil {
|
||||
// not expected since validation should be performed before
|
||||
return logger.Prm{}, errors.New("incorrect allowed tags format: " + c.LoggerCfg.destination)
|
||||
}
|
||||
|
||||
return prm, nil
|
||||
}
|
||||
|
@ -1381,7 +1389,7 @@ func (c *cfg) getComponents(ctx context.Context) []dCmp {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
c.log.Reload(prm)
|
||||
logger.UpdateLevelForTags(prm)
|
||||
return nil
|
||||
}})
|
||||
components = append(components, dCmp{"runtime", func() error {
|
||||
|
|
|
@ -2,6 +2,7 @@ package loggerconfig
|
|||
|
||||
import (
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config"
|
||||
|
@ -60,6 +61,21 @@ func Timestamp(c *config.Config) bool {
|
|||
return config.BoolSafe(c.Sub(subsection), "timestamp")
|
||||
}
|
||||
|
||||
// Tags returns the value of "tags" config parameter from "logger" section.
|
||||
func Tags(c *config.Config) [][]string {
|
||||
var res [][]string
|
||||
sub := c.Sub(subsection).Sub("tags")
|
||||
for i := 0; ; i++ {
|
||||
s := sub.Sub(strconv.FormatInt(int64(i), 10))
|
||||
names := config.StringSafe(s, "names")
|
||||
if names == "" {
|
||||
break
|
||||
}
|
||||
res = append(res, []string{names, config.StringSafe(s, "level")})
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
// ToLokiConfig extracts loki config.
|
||||
func ToLokiConfig(c *config.Config) loki.Config {
|
||||
hostname, _ := os.Hostname()
|
||||
|
|
|
@ -30,6 +30,11 @@ func validateConfig(c *config.Config) error {
|
|||
return fmt.Errorf("invalid logger destination: %w", err)
|
||||
}
|
||||
|
||||
err = loggerPrm.SetTags(loggerconfig.Tags(c))
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid list of allowed tags: %w", err)
|
||||
}
|
||||
|
||||
// shard configuration validation
|
||||
|
||||
shardNum := 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue