Commit 55a82f0
fix(loki.source.docker): Parse timestamp correctly when log line only contains newline [backport] (#5496)
## Backport of #5489
This PR backports #5489 to release/v1.13.
### Original PR Author
@kalleep
### Description
### Pull Request Details
Regression from #4713. Before that
pr we parsed log lines that only included newlines.
In this pr I fixed the issue so we no longer report an error but we keep
the behavior of not forwarding empty lines and add a debug log for these
cases.
### Issue(s) fixed by this Pull Request
Fixes: #5476
### Notes to the Reviewer
<!-- Add any relevant notes for the reviewers and testers of this PR.
-->
### PR Checklist
<!-- Remove items that do not apply. For completed items, change [ ] to
[x]. -->
- [ ] Documentation added
- [x] Tests updated
- [ ] Config converters updated
---
*This backport was created automatically.*
Co-authored-by: Karl Persson <23356117+kalleep@users.noreply.github.com>1 parent 2bbc37e commit 55a82f0
File tree
2 files changed
+87
-10
lines changed- internal/component/loki/source/docker
2 files changed
+87
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
242 | 242 | | |
243 | 243 | | |
244 | 244 | | |
245 | | - | |
246 | | - | |
247 | 245 | | |
248 | | - | |
| 246 | + | |
249 | 247 | | |
250 | 248 | | |
251 | 249 | | |
252 | | - | |
253 | | - | |
254 | | - | |
255 | | - | |
256 | | - | |
257 | | - | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
258 | 254 | | |
259 | 255 | | |
260 | 256 | | |
| |||
264 | 260 | | |
265 | 261 | | |
266 | 262 | | |
267 | | - | |
268 | 263 | | |
| 264 | + | |
| 265 | + | |
269 | 266 | | |
270 | 267 | | |
271 | 268 | | |
| |||
278 | 275 | | |
279 | 276 | | |
280 | 277 | | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
281 | 283 | | |
282 | 284 | | |
283 | 285 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
216 | 217 | | |
217 | 218 | | |
218 | 219 | | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
219 | 275 | | |
220 | 276 | | |
221 | 277 | | |
| |||
254 | 310 | | |
255 | 311 | | |
256 | 312 | | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
257 | 332 | | |
258 | 333 | | |
259 | 334 | | |
| |||
0 commit comments