[chore][pkg/stanza] Simplify reader.ValidateOrClose #28419
Closed
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-simplify-reader-validate
branch
from
959689c to
70c8472
Compare
djaglowski
added a commit
that referenced
this pull request
Oct 24, 2023
Follows #28419 This discards the separate "roller" and implements the same functionality directly in `fileconsumer.Manager`. The motivation for this is to move towards a system of managing files where each file is managed by only one list at a time. This PR retains two overlapping slices of readers (`previousPollFiles` and `knownFiles`), but the functionality does not change. #27823 should get us the rest of the way there.
|
Merged as part of #28451 |
sigilioso
pushed a commit
to carlossscastro/opentelemetry-collector-contrib
that referenced
this pull request
Oct 27, 2023
…metry#28451) Follows open-telemetry#28419 This discards the separate "roller" and implements the same functionality directly in `fileconsumer.Manager`. The motivation for this is to move towards a system of managing files where each file is managed by only one list at a time. This PR retains two overlapping slices of readers (`previousPollFiles` and `knownFiles`), but the functionality does not change. open-telemetry#27823 should get us the rest of the way there.
jmsnll
pushed a commit
to jmsnll/opentelemetry-collector-contrib
that referenced
this pull request
Nov 12, 2023
…metry#28451) Follows open-telemetry#28419 This discards the separate "roller" and implements the same functionality directly in `fileconsumer.Manager`. The motivation for this is to move towards a system of managing files where each file is managed by only one list at a time. This PR retains two overlapping slices of readers (`previousPollFiles` and `knownFiles`), but the functionality does not change. open-telemetry#27823 should get us the rest of the way there.
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.
This PR changes
ValidateOrClosetoValidate. The closing behavior is reasonable in theory but become problematic if closing a reader is associated with popping out its metadata (see #27823). Ultimately, it is not necessary because continuing the loop effectively skips over the reader and it is closed shortly thereafter along with all the other files in the slice.