Skip to content

src: do not format the values of the fields for the logs without the logger #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Insei merged 1 commit into from
Oct 19, 2026
Merged

src: do not format the values of the fields for the logs without the logger #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,13 @@ func (c *Manager) parse(ctx context.Context, conf any, reload bool) ([]FieldSour
}
c.mu.Unlock()
}
if !reload {
logger := c.logger()
// the values of the fields are not formatted for the logs if nobody writes them
_, silent := logger.(*noopLogger)
if !reload && !silent {
for _, path := range paths {
field := register.Storage.MustFind(path)
c.logger().Debug("initial",
logger.Debug("initial",
LogField("config", confTypeOf.String()),
LogField("field", path),
LogField("value", getLoggerValue(field, convert.GetFieldValue(field, confParse))))
Expand All @@ -285,7 +288,7 @@ func (c *Manager) parse(ctx context.Context, conf any, reload bool) ([]FieldSour
err = loader.Load()
}
if err != nil {
c.logger().Error(errorMessage(err, "failed to load"), LogField("driver", d.GetName()), LogField("details", err.Error()))
logger.Error(errorMessage(err, "failed to load"), LogField("driver", d.GetName()), LogField("details", err.Error()))
errs = append(errs, fmt.Errorf("%s driver: %w", d.GetName(), err))
continue
}
Expand All @@ -294,16 +297,21 @@ func (c *Manager) parse(ctx context.Context, conf any, reload bool) ([]FieldSour
for _, d := range drivers {
for _, path := range paths {
field := register.Storage.MustFind(path)
log := c.logger().With(
LogField("config", confTypeOf.String()),
LogField("driver", d.GetName()),
LogField("field", path))
log := logger
if !silent {
log = logger.With(
LogField("config", confTypeOf.String()),
LogField("driver", d.GetName()),
LogField("field", path))
}
driverValue, err := d.GetValue(field)
switch {
case errors.Is(err, ErrIncorrectTagSettings):
log.Warn("ignore", LogField("details", err.Error()))
if !silent {
log.Warn("ignore", LogField("details", err.Error()))
}
case errors.Is(err, ErrValueNotFound):
if !reload {
if !reload && !silent {
log.Debug("skip", LogField("details", err.Error()))
}
case err != nil:
Expand All @@ -319,7 +327,7 @@ func (c *Manager) parse(ctx context.Context, conf any, reload bool) ([]FieldSour
value = convert.Merge(convert.GetFieldValue(field, confParse), value)
}
if !reflect.DeepEqual(convert.GetFieldValue(field, confParse), value) {
if !reload {
if !reload && !silent {
log.Debug("override",
LogField("key", driverValue.Source),
LogField("value", getLoggerValue(field, value)))
Expand Down Expand Up @@ -404,6 +412,10 @@ func (c *Manager) Sources(conf any) []FieldSource {

// logChanges logs fields with different values in prev and next configs, next config is parsed with sources.
func (c *Manager) logChanges(storage fmap.Storage, prev, next any, prefix string, sources []FieldSource) {
logger := c.logger()
if _, silent := logger.(*noopLogger); silent {
return
}
fieldSources := make(map[string]FieldSource, len(sources))
for _, source := range sources {
fieldSources[source.Field] = source
Expand All @@ -424,7 +436,7 @@ func (c *Manager) logChanges(storage fmap.Storage, prev, next any, prefix string
fields = append(fields, LogField("key", source.Source))
}
fields = append(fields, LogField("value", getLoggerValue(field, value)))
c.logger().Debug("override", fields...)
logger.Debug("override", fields...)
}
}

Expand Down
Loading