CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.tail): Use correct initial_read_offset persistent offset naming in the code (#16643)

This commit is contained in:
Eugene 2025-03-21 17:55:31 +03:00 committed by GitHub
parent 0a8cbed073
commit be6a53defe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inputs/tail/tail.go
View File

@ -94,7 +94,7 @@ func (t *Tail) Init() error {
if t.FromBeginning { if t.FromBeginning {
t.InitialReadOffset = "beginning" t.InitialReadOffset = "beginning"
} else { } 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 return &tail.SeekInfo{Whence: 0, Offset: 0}, nil
case "end": case "end":
return &tail.SeekInfo{Whence: 2, Offset: 0}, nil return &tail.SeekInfo{Whence: 2, Offset: 0}, nil
case "", "save-or-end": case "", "saved-or-end":
if offset, ok := t.offsets[file]; ok { if offset, ok := t.offsets[file]; ok {
t.Log.Debugf("Using offset %d for %q", offset, file) t.Log.Debugf("Using offset %d for %q", offset, file)
return &tail.SeekInfo{Whence: 0, Offset: offset}, nil return &tail.SeekInfo{Whence: 0, Offset: offset}, nil
} }
return &tail.SeekInfo{Whence: 2, Offset: 0}, nil return &tail.SeekInfo{Whence: 2, Offset: 0}, nil
case "save-or-beginning": case "saved-or-beginning":
if offset, ok := t.offsets[file]; ok { if offset, ok := t.offsets[file]; ok {
t.Log.Debugf("Using offset %d for %q", offset, file) t.Log.Debugf("Using offset %d for %q", offset, file)
return &tail.SeekInfo{Whence: 0, Offset: offset}, nil return &tail.SeekInfo{Whence: 0, Offset: offset}, nil

18
plugins/inputs/tail/tail_test.go
View File

@ -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{}, offsets: map[string]int64{},
file: "test.log", file: "test.log",
InitialReadOffset: "save-or-end", InitialReadOffset: "saved-or-end",
expected: &tail.SeekInfo{ expected: &tail.SeekInfo{
Whence: 2, Whence: 2,
Offset: 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}, offsets: map[string]int64{"test.log": 100},
file: "test.log", file: "test.log",
InitialReadOffset: "save-or-end", InitialReadOffset: "saved-or-end",
expected: &tail.SeekInfo{ expected: &tail.SeekInfo{
Whence: 0, Whence: 0,
Offset: 100, 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", name: "Read from start when offset not exists and initial_read_offset set to save-offset-or-start",
offsets: map[string]int64{}, offsets: map[string]int64{},
file: "test.log", file: "test.log",
InitialReadOffset: "save-or-beginning", InitialReadOffset: "saved-or-beginning",
expected: &tail.SeekInfo{ expected: &tail.SeekInfo{
Whence: 0, Whence: 0,
Offset: 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}, offsets: map[string]int64{"test.log": 100},
file: "test.log", file: "test.log",
InitialReadOffset: "save-or-beginning", InitialReadOffset: "saved-or-beginning",
expected: &tail.SeekInfo{ expected: &tail.SeekInfo{
Whence: 0, Whence: 0,
Offset: 100, Offset: 100,
@ -909,8 +909,8 @@ func TestSetInitialValueForInitialReadOffset(t *testing.T) {
expected: "beginning", expected: "beginning",
}, },
{ {
name: "Set InitialReadOffset to save-or-end when from_beginning set to false and initial_read_offset not set", name: "Set InitialReadOffset to saved-or-end when from_beginning set to false and initial_read_offset not set",
expected: "save-or-end", expected: "saved-or-end",
}, },
{ {
name: "Ignore from_beginning when initial_read_offset is set", name: "Ignore from_beginning when initial_read_offset is set",