Skip to content
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

Jump to bottom

Backport of bug: fix data race in hclogger into release/0.16.x #4657

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Backport of bug: fix data race in hclogger into release/0.16.x #4657

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594a96e
backport of commit 2ee70958c8444e7c8eb1be9e5083f099954ddb2d
irenarindos Apr 15, 2024
5ac77c1
backport of commit 4a3160b66179fb5ca8d6cc5a5f593c5dc831871c
irenarindos Apr 17, 2024
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
5 changes: 4 additions & 1 deletion internal/event/hclog_formatter_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ type hclogFormatterFilter struct {
allow []*filter
deny []*filter
signer signer
l sync.RWMutex
// l protects the signer field
l sync.RWMutex
}

func newHclogFormatterFilter(jsonFormat bool, opt ...Option) (*hclogFormatterFilter, error) {
Expand Down Expand Up @@ -205,6 +206,8 @@ func (f *hclogFormatterFilter) Process(ctx context.Context, e *eventlogger.Event
if err != nil {
return nil, fmt.Errorf("%s: unable to format: %w", op, err)
}
f.l.Lock()
defer f.l.Unlock()
if f.signer != nil && string(e.Type) == string(AuditType) {
bufHmac, err := f.signer(ctx, buf.Bytes())
if err != nil {
Expand Down
Loading