fix(promtail): Fix cri tags extra new lines. #7997
Conversation
When re-creating single lines from multiple partial lines, `\n` should be avoided to join the partial lines. Related: #6177 (comment) Fixes: #7996 Signed-off-by: Kaviraj <[email protected]>
Signed-off-by: Kaviraj <[email protected]>
|
./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell. + ingester 0%
+ distributor 0%
+ querier 0%
+ querier/queryrange 0%
+ iter 0%
+ storage 0%
+ chunkenc 0%
+ logql 0%
+ loki 0% |
| @@ -107,50 +107,33 @@ func TestCRI_tags(t *testing.T) { | |||
| { | |||
| name: "tag P", | |||
| lines: []string{ | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 1", | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 2", | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 1 ", | |||
There was a problem hiding this comment.
Do partial lines come in with a space at the end or should we be joining with " "?
There was a problem hiding this comment.
I don't think we have to handle the spaces here, cri will just split without any adding any extra characters. We should join as it is.
There was a problem hiding this comment.
Ok, it looks like cri-o splits lines wherever. Thanks!
| @@ -107,50 +107,33 @@ func TestCRI_tags(t *testing.T) { | |||
| { | |||
| name: "tag P", | |||
| lines: []string{ | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 1", | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 2", | |||
| "2019-05-07T18:57:50.904275087+00:00 stdout P partial line 1 ", | |||
There was a problem hiding this comment.
Ok, it looks like cri-o splits lines wherever. Thanks!
What this PR does / why we need it:
When re-creating single lines from multiple partial lines,
\nshould be avoided to join the partial lines.Related: #6177 (comment)
Example
if Original log line is
And got split into partial lines via CRI
The result should be without \n when joining both of those lines.
Signed-off-by: Kaviraj [email protected]
Which issue(s) this PR fixes:
Fixes: #7996
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguideCHANGELOG.mdupdated