Skip to content

Commit

Permalink
Make naming consistent with the main branch
Browse files Browse the repository at this point in the history 
In elastic#36065 a few fields were
renamed in order to clarify their purpose. Unfortunately, this rename
was a part of a new feature PR which was not supposed to be backported
to 7.17.

However, backporting some other changes related to this code
has now become challenging and results in build failures (note the
fixing commits):

- elastic#36095
- elastic#36264

This PR makes the naming consistent with the main branch, so we can
easily backport changes.
  • Loading branch information
@rdner
rdner committed Aug 12, 2023
1 parent 78c91e5 commit b0a378b
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
76 changes: 38 additions & 38 deletions filebeat/input/filestream/fswatch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ scanner:
Op: loginp.OpCreate,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 5}, // 5 bytes written
Info: testFileInfo{name: basename, size: 5}, // 5 bytes written
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -90,7 +90,7 @@ scanner:
Op: loginp.OpWrite,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 10}, // +5 bytes appended
Info: testFileInfo{name: basename, size: 10}, // +5 bytes appended
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -112,7 +112,7 @@ scanner:
Op: loginp.OpRename,
Descriptor: loginp.FileDescriptor{
Filename: newFilename,
Info: testFileInfo{path: newBasename, size: 10},
Info: testFileInfo{name: newBasename, size: 10},
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -132,7 +132,7 @@ scanner:
Op: loginp.OpTruncate,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 2},
Info: testFileInfo{name: basename, size: 2},
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -152,7 +152,7 @@ scanner:
Op: loginp.OpTruncate,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 2},
Info: testFileInfo{name: basename, size: 2},
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -171,7 +171,7 @@ scanner:
Op: loginp.OpDelete,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 2},
Info: testFileInfo{name: basename, size: 2},
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -209,7 +209,7 @@ scanner:
Descriptor: loginp.FileDescriptor{
Filename: filename,
Fingerprint: "2edc986847e209b4016e141a6dc8716d3207350f416969382d431539bf292e4a",
Info: testFileInfo{path: basename, size: 1024},
Info: testFileInfo{name: basename, size: 1024},
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -240,7 +240,7 @@ scanner:
Op: loginp.OpCreate,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 1024},
Info: testFileInfo{name: basename, size: 1024},
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -298,7 +298,7 @@ scanner:
Op: loginp.OpCreate,
Descriptor: loginp.FileDescriptor{
Filename: filename,
Info: testFileInfo{path: basename, size: 5}, // +5 bytes appended
Info: testFileInfo{name: basename, size: 5}, // +5 bytes appended
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -332,7 +332,7 @@ scanner:
Descriptor: loginp.FileDescriptor{
Filename: filename,
Fingerprint: "2edc986847e209b4016e141a6dc8716d3207350f416969382d431539bf292e4a",
Info: testFileInfo{path: basename, size: 1024},
Info: testFileInfo{name: basename, size: 1024},
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -385,7 +385,7 @@ scanner:
Op: loginp.OpCreate,
Descriptor: loginp.FileDescriptor{
Filename: firstFilename,
Info: testFileInfo{path: firstBasename, size: 5}, // "line\n"
Info: testFileInfo{name: firstBasename, size: 5}, // "line\n"
},
}
requireEqualEvents(t, expEvent, e)
Expand All @@ -396,7 +396,7 @@ scanner:
Op: loginp.OpCreate,
Descriptor: loginp.FileDescriptor{
Filename: secondFilename,
Info: testFileInfo{path: secondBasename, size: 5}, // "line\n"
Info: testFileInfo{name: secondBasename, size: 5}, // "line\n"
},
}
requireEqualEvents(t, expEvent, e)
Expand Down Expand Up @@ -483,35 +483,35 @@ scanner:
Filename: normalFilename,
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
undersizedFilename: {
Filename: undersizedFilename,
Info: testFileInfo{
size: sizes[undersizedFilename],
path: undersizedBasename,
name: undersizedBasename,
},
},
excludedFilename: {
Filename: excludedFilename,
Info: testFileInfo{
size: sizes[excludedFilename],
path: excludedBasename,
name: excludedBasename,
},
},
excludedIncludedFilename: {
Filename: excludedIncludedFilename,
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
travelerSymlinkFilename: {
Filename: travelerSymlinkFilename,
Info: testFileInfo{
size: sizes[travelerFilename],
path: travelerSymlinkBasename,
name: travelerSymlinkBasename,
},
},
},
Expand All @@ -532,28 +532,28 @@ scanner:
Filename: normalFilename,
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
undersizedFilename: {
Filename: undersizedFilename,
Info: testFileInfo{
size: sizes[undersizedFilename],
path: undersizedBasename,
name: undersizedBasename,
},
},
excludedFilename: {
Filename: excludedFilename,
Info: testFileInfo{
size: sizes[excludedFilename],
path: excludedBasename,
name: excludedBasename,
},
},
excludedIncludedFilename: {
Filename: excludedIncludedFilename,
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
},
Expand All @@ -575,21 +575,21 @@ scanner:
Filename: normalFilename,
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
undersizedFilename: {
Filename: undersizedFilename,
Info: testFileInfo{
size: sizes[undersizedFilename],
path: undersizedBasename,
name: undersizedBasename,
},
},
travelerSymlinkFilename: {
Filename: travelerSymlinkFilename,
Info: testFileInfo{
size: sizes[travelerFilename],
path: travelerSymlinkBasename,
name: travelerSymlinkBasename,
},
},
},
Expand All @@ -606,14 +606,14 @@ scanner:
Filename: normalFilename,
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
undersizedFilename: {
Filename: undersizedFilename,
Info: testFileInfo{
size: sizes[undersizedFilename],
path: undersizedBasename,
name: undersizedBasename,
},
},
},
Expand All @@ -635,7 +635,7 @@ scanner:
Filename: excludedIncludedFilename,
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
},
Expand All @@ -652,7 +652,7 @@ scanner:
Filename: excludedIncludedFilename,
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
},
Expand All @@ -669,14 +669,14 @@ scanner:
Filename: excludedIncludedFilename,
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
travelerSymlinkFilename: {
Filename: travelerSymlinkFilename,
Info: testFileInfo{
size: sizes[travelerFilename],
path: travelerSymlinkBasename,
name: travelerSymlinkBasename,
},
},
},
Expand All @@ -698,31 +698,31 @@ scanner:
Fingerprint: "2edc986847e209b4016e141a6dc8716d3207350f416969382d431539bf292e4a",
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
excludedFilename: {
Filename: excludedFilename,
Fingerprint: "bd151321c3bbdb44185414a1b56b5649a00206dd4792e7230db8904e43987336",
Info: testFileInfo{
size: sizes[excludedFilename],
path: excludedBasename,
name: excludedBasename,
},
},
excludedIncludedFilename: {
Filename: excludedIncludedFilename,
Fingerprint: "bfdb99a65297062658c26dfcea816d76065df2a2da2594bfd9b96e9e405da1c2",
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
travelerSymlinkFilename: {
Filename: travelerSymlinkFilename,
Fingerprint: "c4058942bffcea08810a072d5966dfa5c06eb79b902bf0011890dd8d22e1a5f8",
Info: testFileInfo{
size: sizes[travelerFilename],
path: travelerSymlinkBasename,
name: travelerSymlinkBasename,
},
},
},
Expand All @@ -744,7 +744,7 @@ scanner:
Fingerprint: "ffe054fe7ae0cb6dc65c3af9b61d5209f439851db43d0ba5997337df154668eb",
Info: testFileInfo{
size: sizes[normalFilename],
path: normalBasename,
name: normalBasename,
},
},
// undersizedFilename got excluded because of the matching fingerprint
Expand All @@ -753,23 +753,23 @@ scanner:
Fingerprint: "9c225a1e6a7df9c869499e923565b93937e88382bb9188145f117195cd41dcd1",
Info: testFileInfo{
size: sizes[excludedFilename],
path: excludedBasename,
name: excludedBasename,
},
},
excludedIncludedFilename: {
Filename: excludedIncludedFilename,
Fingerprint: "7985b2b9750bdd3c76903db408aff3859204d6334279eaf516ecaeb618a218d5",
Info: testFileInfo{
size: sizes[excludedIncludedFilename],
path: excludedIncludedBasename,
name: excludedIncludedBasename,
},
},
travelerSymlinkFilename: {
Filename: travelerSymlinkFilename,
Fingerprint: "da437600754a8eed6c194b7241b078679551c06c7dc89685a9a71be7829ad7e5",
Info: testFileInfo{
size: sizes[travelerFilename],
path: travelerSymlinkBasename,
name: travelerSymlinkBasename,
},
},
},
Expand Down
6 changes: 3 additions & 3 deletions filebeat/input/filestream/identifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type fileIdentifier interface {
// fileSource implements the Source interface
// It is required to identify and manage file sources.
type fileSource struct {
info loginp.FileDescriptor
desc loginp.FileDescriptor
newPath string
oldPath string
truncated bool
Expand Down Expand Up @@ -109,7 +109,7 @@ func newINodeDeviceIdentifier(_ *common.Config) (fileIdentifier, error) {

func (i *inodeDeviceIdentifier) GetSource(e loginp.FSEvent) fileSource {
return fileSource{
info: e.Descriptor,
desc: e.Descriptor,
newPath: e.NewPath,
oldPath: e.OldPath,
truncated: e.Op == loginp.OpTruncate,
Expand Down Expand Up @@ -148,7 +148,7 @@ func (p *pathIdentifier) GetSource(e loginp.FSEvent) fileSource {
path = e.OldPath
}
return fileSource{
info: e.Descriptor,
desc: e.Descriptor,
newPath: e.NewPath,
oldPath: e.OldPath,
truncated: e.Op == loginp.OpTruncate,
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/filestream/identifier_fingerprint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func newFingerprintIdentifier(cfg *common.Config) (fileIdentifier, error) {

func (i *fingerprintIdentifier) GetSource(e loginp.FSEvent) fileSource {
return fileSource{
info: e.Descriptor,
desc: e.Descriptor,
newPath: e.NewPath,
oldPath: e.OldPath,
truncated: e.Op == loginp.OpTruncate,
Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/filestream/identifier_inode_deviceid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (i *inodeMarkerIdentifier) markerContents() string {
func (i *inodeMarkerIdentifier) GetSource(e loginp.FSEvent) fileSource {
osstate := file.GetOSState(e.Descriptor.Info)
return fileSource{
info: e.Descriptor,
desc: e.Descriptor,
newPath: e.NewPath,
oldPath: e.OldPath,
truncated: e.Op == loginp.OpTruncate,
Expand Down
4 changes: 2 additions & 2 deletions filebeat/input/filestream/prospector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,13 +724,13 @@ func TestOnRenameFileIdentity(t *testing.T) {
}

type testFileInfo struct {
path string
name string
size int64
time time.Time
sys interface{}
}

func (t testFileInfo) Name() string { return t.path }
func (t testFileInfo) Name() string { return t.name }
func (t testFileInfo) Size() int64 { return t.size }
func (t testFileInfo) Mode() os.FileMode { return 0 }
func (t testFileInfo) ModTime() time.Time { return t.time }
Expand Down

0 comments on commit b0a378b

Please sign in to comment.