Skip to content

QUIC logging update #55500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarnaViire merged 4 commits into from
Jul 12, 2021
Merged

QUIC logging update #55500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00351d9
Update logging to use msquic pointers
CarnaViire Jul 10, 2021
14295b7
Merge branch 'main' into quic-logging-update
CarnaViire Jul 12, 2021
f625a0a
rename LogId -> TraceId
CarnaViire Jul 12, 2021
366b45d
fix
CarnaViire Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix
  • Loading branch information
@CarnaViire
CarnaViire committed Jul 12, 2021
commit 366b45db53e5ecd08bc8773a24fe502977524a70
8 changes: 4 additions & 4 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public MsQuicConnection(IPEndPoint localEndPoint, IPEndPoint remoteEndPoint, Saf
throw;
}

_state.TraceId = MsQuicLogHelper.GetTraceId(_state.Handle);
_state.TraceId = MsQuicTraceHelper.GetTraceId(_state.Handle);
if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(_state, $"{TraceId()} Inbound connection created");
Expand Down Expand Up @@ -205,7 +205,7 @@ public MsQuicConnection(QuicClientConnectionOptions options)
throw;
}

_state.TraceId = MsQuicLogHelper.GetTraceId(_state.Handle);
_state.TraceId = MsQuicTraceHelper.GetTraceId(_state.Handle);
if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(_state, $"{TraceId()} Outbound connection created");
Expand Down Expand Up @@ -704,7 +704,7 @@ private void Dispose(bool disposing)
return;
}

if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} disposing {disposing}");
if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} Stream disposing {disposing}");

bool releaseHandles = false;
lock (_state)
Expand All @@ -725,7 +725,7 @@ private void Dispose(bool disposing)
_configuration?.Dispose();
if (releaseHandles)
{
if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} releasing handle");
if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} Connection releasing handle");

// We may not be fully initialized if constructor fails.
_state.Handle?.Dispose();
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/MsQuic/MsQuicStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ private void Dispose(bool disposing)
}


if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} disposing {disposing}");
if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(_state, $"{TraceId()} Stream disposing {disposing}");

bool callShutdown = false;
bool abortRead = false;
Expand Down