Skip to content
This repository has been archived by the owner on May 25, 2022. It is now read-only.

feat(operator/recombine): do not combine logs before first_entry matches line #416

Merged
merged 5 commits into from
Mar 8, 2022

Conversation

sumo-drosiek
Copy link
Member

Fixes #415

do not combine logs before first_entry matches line
See attached issue for more details

@sumo-drosiek sumo-drosiek requested a review from a team February 25, 2022 13:51
@codecov
Copy link

codecov bot commented Feb 25, 2022

Codecov Report

Merging #416 (98a740e) into main (26aeee9) will increase coverage by 0.0%.
The diff coverage is 100.0%.

Impacted file tree graph

@@          Coverage Diff          @@
##            main    #416   +/-   ##
=====================================
  Coverage   75.1%   75.2%           
=====================================
  Files         83      83           
  Lines       4022    4025    +3     
=====================================
+ Hits        3023    3027    +4     
  Misses       696     696           
+ Partials     303     302    -1     
Impacted Files Coverage Δ
operator/transformer/recombine/recombine.go 75.6% <100.0%> (+1.3%) ⬆️
operator/input/file/file.go 70.1% <0.0%> (-0.1%) ⬇️

…hes line

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
… for first entry

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Copy link
Member

@djaglowski djaglowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delayed response - on PTO last week.

This looks a lot better but I think needs one more small iteration to tidy it up.

operator/transformer/recombine/recombine.go Outdated Show resolved Hide resolved
sumo-drosiek and others added 2 commits March 8, 2022 07:54
Co-authored-by: Daniel Jaglowski <jaglows3@gmail.com>
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Copy link
Member

@djaglowski djaglowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks @sumo-drosiek

@djaglowski djaglowski merged commit fc8a875 into open-telemetry:main Mar 8, 2022
@sumo-drosiek sumo-drosiek deleted the drosiek-recombine-match branch March 8, 2022 14:49
jsirianni pushed a commit to jsirianni/opentelemetry-log-collection that referenced this pull request Mar 28, 2022
…hes line (open-telemetry#416)

* feat(operator/recombine): do not combine logs before first_entry matches line

Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

recombine: do not combine if is_first_entry never matched
2 participants