tsweb: log once per request #12141
Open
tsweb: log once per request #12141
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
icio
force-pushed
the
icio/tsweb-nested-stdhandler
branch
2 times, most recently
from
a87d78e
to
c53e442
Compare
StdHandler/retHandler would previously emit one log line for each request. If there were multiple StdHandler in the chain, there would be one log line per instance of retHandler. With this change, only the outermost StdHandler/logHandler actually logs the request. The error-rendering part of retHandler lives on in errorHandler, and errorHandler passes those errors up the stack to logHandler through a callback that logHandler places in the request.Context(). Updates tailscale/corp#19999 Signed-off-by: Paul Scott <[email protected]>
icio
force-pushed
the
icio/tsweb-nested-stdhandler
branch
from
c53e442
to
2cdec70
Compare
icio
commented
May 15, 2024
| }) | ||
| if diff := cmp.Diff(logs[0], test.wantLog, errTransform); diff != "" { | ||
| t.Errorf("handler wrote incorrect request log (-got+want):\n%s", diff) | ||
| if diff := cmp.Diff(logs[0], test.wantLog, cmpopts.IgnoreFields(AccessLogRecord{}, "Bytes")); diff != "" { |
There was a problem hiding this comment.
It seems like we weren't setting Bytes if the error handled wrote the message. Is it OK to write the error response's Bytes into this field. Surely nothing assumes this means SuccessfulBytes? 😅
If it's OK to log the correct Bytes, I'll update the test cases and remove this IgnoreFields.
marwan-at-work
approved these changes
May 30, 2024
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.
StdHandler/retHandler would previously emit one log line for each request. If there were multiple StdHandler in the chain, there would be one log line per instance of retHandler.
With this change, only the outermost StdHandler/logHandler actually logs the request. The error-rendering part of retHandler lives on in errorHandler, and errorHandler passes those errors up the stack to logHandler through a callback that logHandler places in the request.Context().
This change already yields the log changes desired in #19999 but we could then swap some StdHandler usage for LogHandler/Handler in various places.
Updates tailscale/corp#19999