Skip to content

Commit

Permalink
[pkg/stanza][receiver/filelog] fix panic when upgrading from v0.71.0 (
Browse files Browse the repository at this point in the history
open-telemetry#30236)

Fixes
open-telemetry#30235

---------

Co-authored-by: Alex Boten <aboten@lightstep.com>
  • Loading branch information
2 people authored and cparkins committed Jan 10, 2024
1 parent 2c0974f commit 683234a
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 6 deletions.
27 changes: 27 additions & 0 deletions .chloggen/fix-stanza-panic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: receiver/filelog

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: fix panic after upgrading from v0.71.0 when using storage

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30235]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
3 changes: 3 additions & 0 deletions pkg/stanza/fileconsumer/internal/checkpoint/checkpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ func Load(ctx context.Context, persister operator.Persister) ([]*reader.Metadata
if err = dec.Decode(rmd); err != nil {
return nil, err
}
if rmd.FileAttributes == nil {
rmd.FileAttributes = map[string]any{}
}

// Migrate readers that used FileAttributes.HeaderAttributes
// This block can be removed in a future release, tentatively v0.90.0
Expand Down
16 changes: 10 additions & 6 deletions pkg/stanza/fileconsumer/internal/checkpoint/checkpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,24 @@ func TestNopEncodingDifferentLogSizes(t *testing.T) {
"one",
[]*reader.Metadata{
{
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("foo")},
Offset: 3,
FileAttributes: make(map[string]any),
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("foo")},
Offset: 3,
},
},
},
{
"two",
[]*reader.Metadata{
{
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("foo")},
Offset: 3,
FileAttributes: make(map[string]any),
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("foo")},
Offset: 3,
},
{
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("barrrr")},
Offset: 6,
FileAttributes: make(map[string]any),
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("barrrr")},
Offset: 6,
},
},
},
Expand All @@ -81,6 +84,7 @@ func TestNopEncodingDifferentLogSizes(t *testing.T) {
},
},
{
FileAttributes: make(map[string]any),
Fingerprint: &fingerprint.Fingerprint{FirstBytes: []byte("barrrr")},
Offset: 6,
HeaderFinalized: true,
Expand Down

0 comments on commit 683234a

Please sign in to comment.