Skip to content

fix: isolate log context fields to prevent upstream leakage #11

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

Open
mnurhidayath wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: isolate log context fields to prevent upstream leakage #11

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
19 changes: 11 additions & 8 deletions loggers/fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,18 @@ func (o *LogFields) Del(key string) {
// AddToLogContext adds log fields to context.
// Any info added here will be added to all logs using this context
func AddToLogContext(ctx context.Context, key string, value interface{}) context.Context {
data := FromContext(ctx)
if data == nil {
ctx = context.WithValue(ctx, contextKey, new(LogFields))
data = FromContext(ctx)
existingFields := FromContext(ctx)
newFields := &LogFields{}

if existingFields != nil {
existingFields.Range(func(key, value interface{}) bool {
newFields.Add(key.(string), value)
return true
})
}
if data != nil {
data.Add(key, value)
}
return ctx

newFields.Add(key, value)
return context.WithValue(ctx, contextKey, newFields)
}

// FromContext fetchs log fields from provided context
Expand Down