From be6a53defe60eb5a796b7ab32406a9f88bbc1cbb Mon Sep 17 00:00:00 2001
From: Eugene <60469435+geugenm@users.noreply.github.com>
Date: Fri, 21 Mar 2025 17:55:31 +0300
Subject: [PATCH] fix(inputs.tail): Use correct initial_read_offset persistent
 offset naming in the code (#16643)

---
 plugins/inputs/tail/tail.go      |  6 +++---
 plugins/inputs/tail/tail_test.go | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 34e091164..d4c18afd4 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -94,7 +94,7 @@ func (t *Tail) Init() error {
 		if t.FromBeginning {
 			t.InitialReadOffset = "beginning"
 		} else {
-			t.InitialReadOffset = "save-or-end"
+			t.InitialReadOffset = "saved-or-end"
 		}
 	}
 
@@ -149,13 +149,13 @@ func (t *Tail) getSeekInfo(file string) (*tail.SeekInfo, error) {
 		return &tail.SeekInfo{Whence: 0, Offset: 0}, nil
 	case "end":
 		return &tail.SeekInfo{Whence: 2, Offset: 0}, nil
-	case "", "save-or-end":
+	case "", "saved-or-end":
 		if offset, ok := t.offsets[file]; ok {
 			t.Log.Debugf("Using offset %d for %q", offset, file)
 			return &tail.SeekInfo{Whence: 0, Offset: offset}, nil
 		}
 		return &tail.SeekInfo{Whence: 2, Offset: 0}, nil
-	case "save-or-beginning":
+	case "saved-or-beginning":
 		if offset, ok := t.offsets[file]; ok {
 			t.Log.Debugf("Using offset %d for %q", offset, file)
 			return &tail.SeekInfo{Whence: 0, Offset: offset}, nil
diff --git a/plugins/inputs/tail/tail_test.go b/plugins/inputs/tail/tail_test.go
index 244aa31a7..8c922228f 100644
--- a/plugins/inputs/tail/tail_test.go
+++ b/plugins/inputs/tail/tail_test.go
@@ -827,20 +827,20 @@ func TestGetSeekInfo(t *testing.T) {
 			},
 		},
 		{
-			name:              "Read from end when offset not exists and initial_read_offset set to save-or-end",
+			name:              "Read from end when offset not exists and initial_read_offset set to saved-or-end",
 			offsets:           map[string]int64{},
 			file:              "test.log",
-			InitialReadOffset: "save-or-end",
+			InitialReadOffset: "saved-or-end",
 			expected: &tail.SeekInfo{
 				Whence: 2,
 				Offset: 0,
 			},
 		},
 		{
-			name:              "Read from offset when offset exists and initial_read_offset set to save-or-end",
+			name:              "Read from offset when offset exists and initial_read_offset set to saved-or-end",
 			offsets:           map[string]int64{"test.log": 100},
 			file:              "test.log",
-			InitialReadOffset: "save-or-end",
+			InitialReadOffset: "saved-or-end",
 			expected: &tail.SeekInfo{
 				Whence: 0,
 				Offset: 100,
@@ -850,17 +850,17 @@ func TestGetSeekInfo(t *testing.T) {
 			name:              "Read from start when offset not exists and initial_read_offset set to save-offset-or-start",
 			offsets:           map[string]int64{},
 			file:              "test.log",
-			InitialReadOffset: "save-or-beginning",
+			InitialReadOffset: "saved-or-beginning",
 			expected: &tail.SeekInfo{
 				Whence: 0,
 				Offset: 0,
 			},
 		},
 		{
-			name:              "Read from offset when offset exists and initial_read_offset set to save-or-end",
+			name:              "Read from offset when offset exists and initial_read_offset set to saved-or-end",
 			offsets:           map[string]int64{"test.log": 100},
 			file:              "test.log",
-			InitialReadOffset: "save-or-beginning",
+			InitialReadOffset: "saved-or-beginning",
 			expected: &tail.SeekInfo{
 				Whence: 0,
 				Offset: 100,
@@ -909,8 +909,8 @@ func TestSetInitialValueForInitialReadOffset(t *testing.T) {
 			expected:      "beginning",
 		},
 		{
-			name:     "Set InitialReadOffset to save-or-end when from_beginning set to false and initial_read_offset not set",
-			expected: "save-or-end",
+			name:     "Set InitialReadOffset to saved-or-end when from_beginning set to false and initial_read_offset not set",
+			expected: "saved-or-end",
 		},
 		{
 			name:              "Ignore from_beginning when initial_read_offset is set",