[pkg/stanza] Always recombine if possible, even if incomplete #30797
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
djaglowski
force-pushed
the
pkg-stanza-recombine-clean-state
branch
from
0dcbf76 to
a54b297
Compare
djaglowski
force-pushed
the
pkg-stanza-recombine-clean-state
branch
from
a54b297 to
0612ff0
Compare
djaglowski
commented
Jan 29, 2024
Comment on lines
-185
to
-197
| entryWithBodyAttr(t1, "file1", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t1, "file3", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t1, "file1", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "file2", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t1, "file1", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "file2", map[string]string{"file.path": "file2"}), | ||
| entryWithBodyAttr(t2, "file3", map[string]string{"file.path": "file2"}), | ||
| entryWithBodyAttr(t1, "start", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t1, "more1a", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t1, "start", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "more1b", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "start", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "more2a", map[string]string{"file.path": "file2"}), | ||
| entryWithBodyAttr(t2, "more2b", map[string]string{"file.path": "file2"}), | ||
| }, | ||
| []*entry.Entry{ | ||
| entryWithBodyAttr(t1, "file1\nfile3", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "file1\nfile2", map[string]string{"file.path": "file1"}), | ||
| entryWithBodyAttr(t2, "file2", map[string]string{"file.path": "file2"}), | ||
| entryWithBodyAttr(t2, "file3", map[string]string{"file.path": "file2"}), |
There was a problem hiding this comment.
Most of these changes are just to clarify the test. (Use meaningful content instead of "file1", etc). The primary change is that the last two tokens are emitted as one after the timeout, rather than each being emitted immediately. A complementary change below adds ExpectEntries because the final token from file1 and the other tokens are not emitted in a deterministic order.
|
@open-telemetry/collector-contrib-approvers, this PR is just waiting for a review if anyone has a moment. |
TylerHelmuth
approved these changes
Jan 31, 2024
cparkins
pushed a commit
to AmadeusITGroup/opentelemetry-collector-contrib
that referenced
this pull request
Feb 1, 2024
…elemetry#30797) Previously, certain circumstances could result in partial logs being emitted without any recombiniation. This could occur when using `is_first_entry`, if the first partial log from a source was emitted before a matching "start of log" indicator was found. This could also occur when the collector was shutting down.
4 tasks
|
@djaglowski Previous behavior was intentional: open-telemetry/opentelemetry-log-collection#415 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, certain circumstances could result in partial logs being emitted without any recombiniation. This could occur when using
is_first_entry, if the first partial log from a source was emitted before a matching "start of log" indicator was found. This could also occur when the collector was shutting down.