Convert lib/reversetunnel to use slog #50362
Merged
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
rosstimothy
added
the
no-changelog
marcoandredinis
approved these changes
Dec 18, 2024
| for { | ||
| select { | ||
| case <-s.ctx.Done(): | ||
| s.logger.WithError(s.ctx.Err()).Debug("Context is closing.") |
There was a problem hiding this comment.
Can we check the s.ctx.Err() != nil log if true?
espadolini
approved these changes
Dec 18, 2024
Comment on lines
803
to
+807
| log := logger | ||
| if roundtrip != 0 { | ||
| log = logger.WithField("latency", roundtrip.String()) | ||
| log = logger.With("latency", logutils.StringerAttr(roundtrip)) | ||
| } | ||
| log.Debugf("Ping <- %v", rconn.conn.RemoteAddr()) | ||
| log.DebugContext(ctx, "Received ping request", "remote_addr", logutils.StringerAttr(rconn.conn.RemoteAddr())) |
There was a problem hiding this comment.
Is there a better way to do conditional fields in slog?
There was a problem hiding this comment.
The only other option I can think of is to use a slice and only append attributes if they should be included in the output.
| @@ -788,9 +802,9 @@ func (s *localSite) handleHeartbeat(rconn *remoteConn, ch ssh.Channel, reqC <-ch | |||
|
|
|||
| log := logger | |||
| if roundtrip != 0 { | |||
| log = logger.WithField("latency", roundtrip.String()) | |||
| log = logger.With("latency", logutils.StringerAttr(roundtrip)) | |||
There was a problem hiding this comment.
Sould we add special handling for time.Duration to our handlers so we don't have to do this every time, kinda like we do for error?
There was a problem hiding this comment.
Possibly, the other option is to use slog.Duration("latency", roundtrip).
public-teleport-github-review-bot
bot
removed the request for review
from camscale
rosstimothy
force-pushed
the
tross/reversetunnel_slog
branch
from
1708df7 to
2444661
Compare
rosstimothy
force-pushed
the
tross/reversetunnel_slog
branch
from
2444661 to
c37d452
Compare
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.
No description provided.