Skip to content

accumulator: add error handling for writing to buffer #569

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
merged 4 commits into from
Oct 21, 2024
Merged

accumulator: add error handling for writing to buffer #569

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a63cf1b
accumulator: add error handling for writing to buffer
florianl Oct 21, 2024
d94590f
Update accumulator/batch.go
florianl Oct 21, 2024
c0daf14
Apply suggestions from code review
florianl Oct 21, 2024
7ca58dd
Apply suggestions from code review
florianl Oct 21, 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
12 changes: 10 additions & 2 deletions accumulator/batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ func (b *Batch) OnAgentInit(reqID, contentEncoding string, raw []byte) error {
b.mu.Lock()
defer b.mu.Unlock()
if b.metadataBytes == 0 && len(metadata) > 0 {
b.metadataBytes, _ = b.buf.Write(metadata)
var bufErr error
b.metadataBytes, bufErr = b.buf.Write(metadata)
if bufErr != nil {
return fmt.Errorf("failed to write metadata to buffer: %v", bufErr)
}
}
i, ok := b.invocations[reqID]
if !ok {
Expand Down Expand Up @@ -195,7 +199,11 @@ func (b *Batch) AddAgentData(apmData APMData) error {
// first line being metadata.
data, after, _ := bytes.Cut(raw, newLineSep)
if b.metadataBytes == 0 {
b.metadataBytes, _ = b.buf.Write(data)
var bufErr error
b.metadataBytes, bufErr = b.buf.Write(data)
if bufErr != nil {
return fmt.Errorf("failed to write data to buffer: %v", err)
}
}
for {
data, after, _ = bytes.Cut(after, newLineSep)
Expand Down