From df044e1076259fa9246c4161ce9c728f3c28b043 Mon Sep 17 00:00:00 2001
From: Andrzej Stencel <astencel@sumologic.com>
Date: Fri, 29 Dec 2023 14:53:02 +0100
Subject: [PATCH 1/2] [pkg/stanza][receiver/filelog] fix panic when upgrading
 from `v0.71.0`

---
 .chloggen/fix-stanza-panic.yaml               | 27 +++++++++++++++++++
 .../internal/checkpoint/checkpoint.go         |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100755 .chloggen/fix-stanza-panic.yaml

diff --git a/.chloggen/fix-stanza-panic.yaml b/.chloggen/fix-stanza-panic.yaml
new file mode 100755
index 000000000000..005588a8a1cf
--- /dev/null
+++ b/.chloggen/fix-stanza-panic.yaml
@@ -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: []
diff --git a/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint.go b/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint.go
index 964a2e324c09..b75933abcc28 100644
--- a/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint.go
+++ b/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint.go
@@ -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

From ce0867295c851ab3550c4dd1b49c9c2496bd9706 Mon Sep 17 00:00:00 2001
From: Andrzej Stencel <astencel@sumologic.com>
Date: Wed, 10 Jan 2024 09:29:12 +0100
Subject: [PATCH 2/2] fix tests

---
 .../internal/checkpoint/checkpoint_test.go       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint_test.go b/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint_test.go
index fd239efdb755..8c09edc6c41a 100644
--- a/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint_test.go
+++ b/pkg/stanza/fileconsumer/internal/checkpoint/checkpoint_test.go
@@ -52,8 +52,9 @@ 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,
 				},
 			},
 		},
@@ -61,12 +62,14 @@ func TestNopEncodingDifferentLogSizes(t *testing.T) {
 			"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,
 				},
 			},
 		},
@@ -81,6 +84,7 @@ func TestNopEncodingDifferentLogSizes(t *testing.T) {
 					},
 				},
 				{
+					FileAttributes:  make(map[string]any),
 					Fingerprint:     &fingerprint.Fingerprint{FirstBytes: []byte("barrrr")},
 					Offset:          6,
 					HeaderFinalized: true,