[chore][pkg/stanza] Unexport reader's file name field #27434
Conversation
djaglowski
force-pushed
the
pkg-stanza-reader-unexporter-filename
branch
from
6809e7a
to
c34e270
Compare
| if !oldReader.ValidateFingerprint() { | ||
| continue OUTER | ||
| } | ||
| if !newReader.NameEquals(oldReader) { |
There was a problem hiding this comment.
Is this a change of behavior?
There was a problem hiding this comment.
I don't think so. The equal check is moved into the function.
The inversion of the condition is met with a complimentary inversion of how we react to it.
There was a problem hiding this comment.
You're right, this was a change. It should only continue the inner loop if the file names do not match. I opened #27454 to make the change separately. I'll plan on rebasing this PR.
| return true | ||
| } | ||
| r.logger.Debugw("Closing truncated file", zap.String(attrs.LogFileName, r.fileName)) | ||
| r.Close() |
There was a problem hiding this comment.
this is not a rename right?
There was a problem hiding this comment.
Right, not just a rename. It also corrects the behavior. It was previously described in the function description that this should happen but it wasn't happening yet. I mentioned the correction in the PR description though I'm not sure this is a user visible change in any case.
There was a problem hiding this comment.
I realized you may have been asking about whether this could be a renamed file. If so:
I don't think we can ascertain whether the file has been renamed. We know the file name as it was when it was first opened (because we called os.Open(filename)), but there is no way to refresh the name from the information we have.
djaglowski
force-pushed
the
pkg-stanza-reader-unexporter-filename
branch
from
c34e270
to
cd2bb7e
Compare
djaglowski
force-pushed
the
pkg-stanza-reader-unexporter-filename
branch
from
6440bb6
to
79d964c
Compare
djaglowski
force-pushed
the
pkg-stanza-reader-unexporter-filename
branch
from
79d964c
to
a586925
Compare
…#27434) Incremental step towards decoupling the Reader struct. This also clarifies and corrects the behavior of the `ValidateOrClose` function.
…#27434) Incremental step towards decoupling the Reader struct. This also clarifies and corrects the behavior of the `ValidateOrClose` function.
Incremental step towards decoupling the Reader struct.
This also clarifies and corrects the behavior of the
ValidateOrClosefunction.