qlog: add support for alpn_information event #4216
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
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #4216 +/- ##
==========================================
+ Coverage 83.64% 83.65% +0.01%
==========================================
Files 147 150 +3
Lines 15167 15500 +333
==========================================
+ Hits 12685 12965 +280
- Misses 2000 2036 +36
- Partials 482 499 +17 ☔ View full report in Codecov by Sentry. |
logging/connection_tracer.go
Outdated
| @@ -34,6 +34,7 @@ type ConnectionTracer struct { | |||
| LossTimerExpired func(TimerType, EncryptionLevel) | |||
| LossTimerCanceled func() | |||
| ECNStateUpdated func(state ECNState, trigger ECNStateTrigger) | |||
| ChoseAlpn func(protocol string) | |||
There was a problem hiding this comment.
I think Go naming conventions would tell us to write it this way:
Suggested change
| ChoseAlpn func(protocol string) | |
| ChoseALPN func(protocol string) |
qlog/event.go
Outdated
| func (e eventAlpnInformation) IsNil() bool { return false } | ||
|
|
||
| func (e eventAlpnInformation) MarshalJSONObject(enc *gojay.Encoder) { | ||
| enc.StringKeyOmitEmpty("chosen_alpn", e.chosenAlpn) |
There was a problem hiding this comment.
Let's not omit the empty value.
Suggested change
| enc.StringKeyOmitEmpty("chosen_alpn", e.chosenAlpn) | |
| enc.StringKey"chosen_alpn", e.chosenAlpn) |
connection.go
Outdated
| @@ -778,6 +778,12 @@ func (s *connection) handleHandshakeConfirmed() error { | |||
| } | |||
| s.mtuDiscoverer.Start(utils.Min(maxPacketSize, protocol.MaxPacketBufferSize)) | |||
| } | |||
|
|
|||
| // do not log earlier to not apply additional pressure on the handshake mutex | |||
| if s.tracer != nil && s.tracer.ChoseAlpn != nil { | |||
There was a problem hiding this comment.
We should be able to log this earlier, at the very latest on handshake completion.
marten-seemann
changed the title
marten-seemann
approved these changes
Dec 26, 2023
nanokatze
pushed a commit
to nanokatze/quic-go
that referenced
this pull request
Feb 1, 2024
* qlog chosen alpn * qlog chosen alpn * qlog: fix capitalization of ALPN --------- Co-authored-by: Marten Seemann <[email protected]>
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.
Split up from #4201