trim both carriage return and newline

kalleep · kalleep · commit 5359df68034a · 2025-12-10T09:45:42.000+01:00
diff --git a/internal/component/loki/source/file/internal/tail/file.go b/internal/component/loki/source/file/internal/tail/file.go
@@ -167,11 +167,7 @@ func (f *File) readLine() (string, error) {
 	if err != nil {
 		return line, err
 	}
-
-	line = strings.TrimRight(line, "\n")
-	// Trim Windows line endings
-	line = strings.TrimSuffix(line, "\r")
-	return line, err
+	return strings.TrimRight(line, "\r\n"), err
 }
 
 // offset returns the current byte offset in the file where the next read will occur.

Original file line number	Diff line number	Diff line change
`@@ -167,11 +167,7 @@ func (f *File) readLine() (string, error) {`
`167`	`167`	`if err != nil {`
`168`	`168`	`return line, err`
`169`	`169`	`}`
`170`		`-`
`171`		`- line = strings.TrimRight(line, "\n")`
`172`		`- // Trim Windows line endings`
`173`		`- line = strings.TrimSuffix(line, "\r")`
`174`		`- return line, err`
	`170`	`+ return strings.TrimRight(line, "\r\n"), err`
`175`	`171`	`}`
`176`	`172`
`177`	`173`	`// offset returns the current byte offset in the file where the next read will occur.`