Sync shared code from runtime (#23843)

github-actions[bot] · web-flow · commit c45e0d707de9 · 2020-07-10T09:40:47.000-07:00
Co-authored-by: github-actions[bot] &lt;41898282+github-actions[bot]@users.noreply.github.com&gt;
diff --git a/src/Shared/runtime/NetEventSource.Common.cs b/src/Shared/runtime/NetEventSource.Common.cs
@@ -29,8 +29,8 @@ namespace System.Net
     // Usage:
     // - Operations that may allocate (e.g. boxing a value type, using string interpolation, etc.) or that may have computations
     //   at call sites should guard access like:
-    //       if (NetEventSource.IsEnabled) NetEventSource.Enter(this, refArg1, valueTypeArg2); // entering an instance method with a value type arg
-    //       if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"Found certificate: {cert}"); // info logging with a formattable string
+    //       if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this, refArg1, valueTypeArg2); // entering an instance method with a value type arg
+    //       if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, $"Found certificate: {cert}"); // info logging with a formattable string
     // - Operations that have zero allocations / measurable computations at call sites can use a simpler pattern, calling methods like:
     //       NetEventSource.Enter(this);                   // entering an instance method
     //       NetEventSource.Info(this, "literal string");  // arbitrary message with a literal string
@@ -103,7 +103,7 @@ public static void Enter(object? thisOrContextObject, FormattableString? formatt
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(formattableString);
-            if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
+            if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
         }
 
         /// <summary>Logs entrance to a method.</summary>
@@ -115,7 +115,7 @@ public static void Enter(object? thisOrContextObject, object arg0, [CallerMember
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(arg0);
-            if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)})");
+            if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)})");
         }
 
         /// <summary>Logs entrance to a method.</summary>
@@ -129,7 +129,7 @@ public static void Enter(object? thisOrContextObject, object arg0, object arg1,
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(arg0);
             DebugValidateArg(arg1);
-            if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)})");
+            if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)})");
         }
 
         /// <summary>Logs entrance to a method.</summary>
@@ -145,7 +145,7 @@ public static void Enter(object? thisOrContextObject, object arg0, object arg1,
             DebugValidateArg(arg0);
             DebugValidateArg(arg1);
             DebugValidateArg(arg2);
-            if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)}, {Format(arg2)})");
+            if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)}, {Format(arg2)})");
         }
 
         [Event(EnterEventId, Level = EventLevel.Informational, Keywords = Keywords.EnterExit)]
@@ -163,7 +163,7 @@ public static void Exit(object? thisOrContextObject, FormattableString? formatta
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(formattableString);
-            if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
+            if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
         }
 
         /// <summary>Logs exit from a method.</summary>
@@ -175,7 +175,7 @@ public static void Exit(object? thisOrContextObject, object arg0, [CallerMemberN
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(arg0);
-            if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, Format(arg0).ToString());
+            if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, Format(arg0).ToString());
         }
 
         /// <summary>Logs exit from a method.</summary>
@@ -189,7 +189,7 @@ public static void Exit(object? thisOrContextObject, object arg0, object arg1, [
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(arg0);
             DebugValidateArg(arg1);
-            if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, $"{Format(arg0)}, {Format(arg1)}");
+            if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, $"{Format(arg0)}, {Format(arg1)}");
         }
 
         [Event(ExitEventId, Level = EventLevel.Informational, Keywords = Keywords.EnterExit)]
@@ -207,7 +207,7 @@ public static void Info(object? thisOrContextObject, FormattableString? formatta
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(formattableString);
-            if (IsEnabled) Log.Info(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
+            if (Log.IsEnabled()) Log.Info(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);
         }
 
         /// <summary>Logs an information message.</summary>
@@ -219,7 +219,7 @@ public static void Info(object? thisOrContextObject, object? message, [CallerMem
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(message);
-            if (IsEnabled) Log.Info(IdOf(thisOrContextObject), memberName, Format(message).ToString());
+            if (Log.IsEnabled()) Log.Info(IdOf(thisOrContextObject), memberName, Format(message).ToString());
         }
 
         [Event(InfoEventId, Level = EventLevel.Informational, Keywords = Keywords.Default)]
@@ -237,7 +237,7 @@ public static void Error(object? thisOrContextObject, FormattableString formatta
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(formattableString);
-            if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(formattableString));
+            if (Log.IsEnabled()) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(formattableString));
         }
 
         /// <summary>Logs an error message.</summary>
@@ -249,7 +249,7 @@ public static void Error(object? thisOrContextObject, object message, [CallerMem
         {
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(message);
-            if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());
+            if (Log.IsEnabled()) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());
         }
 
         [Event(ErrorEventId, Level = EventLevel.Error, Keywords = Keywords.Default)]
@@ -268,7 +268,7 @@ public static void Fail(object? thisOrContextObject, FormattableString formattab
             // Don't call DebugValidateArg on args, as we expect Fail to be used in assert/failure situations
             // that should never happen in production, and thus we don't care about extra costs.
 
-            if (IsEnabled) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(formattableString));
+            if (Log.IsEnabled()) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(formattableString));
             Debug.Fail(Format(formattableString), $"{IdOf(thisOrContextObject)}.{memberName}");
         }
 
@@ -282,7 +282,7 @@ public static void Fail(object? thisOrContextObject, object message, [CallerMemb
             // Don't call DebugValidateArg on args, as we expect Fail to be used in assert/failure situations
             // that should never happen in production, and thus we don't care about extra costs.
 
-            if (IsEnabled) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(message).ToString());
+            if (Log.IsEnabled()) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(message).ToString());
             Debug.Fail(Format(message).ToString(), $"{IdOf(thisOrContextObject)}.{memberName}");
         }
 
@@ -311,7 +311,7 @@ public static void DumpBuffer(object? thisOrContextObject, byte[] buffer, [Calle
         [NonEvent]
         public static void DumpBuffer(object? thisOrContextObject, byte[] buffer, int offset, int count, [CallerMemberName] string? memberName = null)
         {
-            if (IsEnabled)
+            if (Log.IsEnabled())
             {
                 if (offset < 0 || offset > buffer.Length - count)
                 {
@@ -343,7 +343,7 @@ public static unsafe void DumpBuffer(object? thisOrContextObject, IntPtr bufferP
             Debug.Assert(bufferPtr != IntPtr.Zero);
             Debug.Assert(count >= 0);
 
-            if (IsEnabled)
+            if (Log.IsEnabled())
             {
                 var buffer = new byte[Math.Min(count, MaxDumpSize)];
                 fixed (byte* targetPtr = buffer)
@@ -369,7 +369,7 @@ public static void Associate(object first, object second, [CallerMemberName] str
         {
             DebugValidateArg(first);
             DebugValidateArg(second);
-            if (IsEnabled) Log.Associate(IdOf(first), memberName, IdOf(first), IdOf(second));
+            if (Log.IsEnabled()) Log.Associate(IdOf(first), memberName, IdOf(first), IdOf(second));
         }
 
         /// <summary>Logs a relationship between two objects.</summary>
@@ -383,7 +383,7 @@ public static void Associate(object? thisOrContextObject, object first, object s
             DebugValidateArg(thisOrContextObject);
             DebugValidateArg(first);
             DebugValidateArg(second);
-            if (IsEnabled) Log.Associate(IdOf(thisOrContextObject), memberName, IdOf(first), IdOf(second));
+            if (Log.IsEnabled()) Log.Associate(IdOf(thisOrContextObject), memberName, IdOf(first), IdOf(second));
         }
 
         [Event(AssociateEventId, Level = EventLevel.Informational, Keywords = Keywords.Default, Message = "[{2}]<-->[{3}]")]
@@ -396,7 +396,7 @@ private void Associate(string thisOrContextObject, string? memberName, string fi
         [Conditional("DEBUG_NETEVENTSOURCE_MISUSE")]
         private static void DebugValidateArg(object? arg)
         {
-            if (!IsEnabled)
+            if (!Log.IsEnabled())
             {
                 Debug.Assert(!(arg is ValueType), $"Should not be passing value type {arg?.GetType()} to logging without IsEnabled check");
                 Debug.Assert(!(arg is FormattableString), $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");
@@ -406,12 +406,9 @@ private static void DebugValidateArg(object? arg)
         [Conditional("DEBUG_NETEVENTSOURCE_MISUSE")]
         private static void DebugValidateArg(FormattableString? arg)
         {
-            Debug.Assert(IsEnabled || arg == null, $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");
+            Debug.Assert(Log.IsEnabled() || arg == null, $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");
         }
 
-        public static new bool IsEnabled =>
-            Log.IsEnabled();
-
         [NonEvent]
         public static string IdOf(object? value) => value != null ? value.GetType().Name + "#" + GetHashCode(value) : NullInstance;
 
diff --git a/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicConnection.cs b/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicConnection.cs
@@ -51,20 +51,20 @@ internal sealed class MsQuicConnection : QuicConnectionProvider
         // constructor for inbound connections
         public MsQuicConnection(IPEndPoint localEndPoint, IPEndPoint remoteEndPoint, IntPtr nativeObjPtr)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
             _localEndPoint = localEndPoint;
             _remoteEndPoint = remoteEndPoint;
             _ptr = nativeObjPtr;
 
             SetCallbackHandler();
             SetIdleTimeout(TimeSpan.FromSeconds(120));
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
         }
 
         // constructor for outbound connections
         public MsQuicConnection(QuicClientConnectionOptions options)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             // TODO need to figure out if/how we want to expose sessions
             // Creating a session per connection isn't ideal.
@@ -75,7 +75,7 @@ public MsQuicConnection(QuicClientConnectionOptions options)
             SetCallbackHandler();
             SetIdleTimeout(options.IdleTimeout);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
         }
 
         internal override IPEndPoint LocalEndPoint
@@ -168,7 +168,7 @@ internal uint HandleEvent(ref ConnectionEvent connectionEvent)
 
         private uint HandleEventConnected(ConnectionEvent connectionEvent)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             SOCKADDR_INET inetAddress = MsQuicParameterHelpers.GetINetParam(MsQuicApi.Api, _ptr, (uint)QUIC_PARAM_LEVEL.CONNECTION, (uint)QUIC_PARAM_CONN.LOCAL_ADDRESS);
             _localEndPoint = MsQuicAddressHelpers.INetToIPEndPoint(inetAddress);
@@ -179,13 +179,13 @@ private uint HandleEventConnected(ConnectionEvent connectionEvent)
             // handle event shutdown initiated by transport
             _connectTcs.Complete(MsQuicStatusCodes.Success);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return MsQuicStatusCodes.Success;
         }
 
         private uint HandleEventShutdownInitiatedByTransport(ConnectionEvent connectionEvent)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             if (!_connected)
             {
@@ -194,7 +194,7 @@ private uint HandleEventShutdownInitiatedByTransport(ConnectionEvent connectionE
 
             _acceptQueue.Writer.Complete();
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
 
             return MsQuicStatusCodes.Success;
         }
@@ -208,22 +208,22 @@ private uint HandleEventShutdownInitiatedByPeer(ConnectionEvent connectionEvent)
 
         private uint HandleEventShutdownComplete(ConnectionEvent connectionEvent)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             _shutdownTcs.Complete(MsQuicStatusCodes.Success);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return MsQuicStatusCodes.Success;
         }
 
         private uint HandleEventNewStream(ConnectionEvent connectionEvent)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             MsQuicStream msQuicStream = new MsQuicStream(this, connectionEvent.StreamFlags, connectionEvent.Data.NewStream.Stream, inbound: true);
 
             _acceptQueue.Writer.TryWrite(msQuicStream);
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
 
             return MsQuicStatusCodes.Success;
         }
@@ -235,7 +235,7 @@ private uint HandleEventStreamsAvailable(ConnectionEvent connectionEvent)
 
         internal override async ValueTask<QuicStreamProvider> AcceptStreamAsync(CancellationToken cancellationToken = default)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             ThrowIfDisposed();
 
@@ -254,7 +254,7 @@ internal override async ValueTask<QuicStreamProvider> AcceptStreamAsync(Cancella
                 };
             }
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return stream;
         }
 
@@ -305,7 +305,7 @@ internal override ValueTask ConnectAsync(CancellationToken cancellationToken = d
         private MsQuicStream StreamOpen(
             QUIC_STREAM_OPEN_FLAG flags)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             IntPtr streamPtr = IntPtr.Zero;
             QuicExceptionHelpers.ThrowIfFailed(
@@ -319,7 +319,7 @@ private MsQuicStream StreamOpen(
 
             MsQuicStream stream = new MsQuicStream(this, flags, streamPtr, inbound: false);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return stream;
         }
 
@@ -337,15 +337,15 @@ private ValueTask ShutdownAsync(
             QUIC_CONNECTION_SHUTDOWN_FLAG Flags,
             long ErrorCode)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             uint status = MsQuicApi.Api.ConnectionShutdownDelegate(
                 _ptr,
                 (uint)Flags,
                 ErrorCode);
             QuicExceptionHelpers.ThrowIfFailed(status, "Failed to shutdown connection.");
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return _shutdownTcs.GetTypelessValueTask();
         }
 
@@ -377,7 +377,7 @@ private void Dispose(bool disposing)
                 return;
             }
 
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             if (_ptr != IntPtr.Zero)
             {
@@ -395,7 +395,7 @@ private void Dispose(bool disposing)
 
             _disposed = true;
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
         }
 
         internal override ValueTask CloseAsync(long errorCode, CancellationToken cancellationToken = default)
diff --git a/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicListener.cs b/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicListener.cs
@@ -62,7 +62,7 @@ internal override IPEndPoint ListenEndPoint
 
         internal override async ValueTask<QuicConnectionProvider> AcceptConnectionAsync(CancellationToken cancellationToken = default)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);
 
             ThrowIfDisposed();
 
@@ -81,7 +81,7 @@ await connection.SetSecurityConfigForConnection(_sslOptions.ServerCertificate!,
                 _options.CertificateFilePath,
                 _options.PrivateKeyFilePath).ConfigureAwait(false);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(this);
+            if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);
             return connection;
         }
 
diff --git a/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicStream.cs b/src/Shared/runtime/Quic/Implementations/MsQuic/MsQuicStream.cs

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ namespace System.Net`
`29`	`29`	`// Usage:`
`30`	`30`	`// - Operations that may allocate (e.g. boxing a value type, using string interpolation, etc.) or that may have computations`
`31`	`31`	`// at call sites should guard access like:`
`32`		`- // if (NetEventSource.IsEnabled) NetEventSource.Enter(this, refArg1, valueTypeArg2); // entering an instance method with a value type arg`
`33`		`- // if (NetEventSource.IsEnabled) NetEventSource.Info(null, $"Found certificate: {cert}"); // info logging with a formattable string`
	`32`	`+ // if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this, refArg1, valueTypeArg2); // entering an instance method with a value type arg`
	`33`	`+ // if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, $"Found certificate: {cert}"); // info logging with a formattable string`
`34`	`34`	`// - Operations that have zero allocations / measurable computations at call sites can use a simpler pattern, calling methods like:`
`35`	`35`	`// NetEventSource.Enter(this); // entering an instance method`
`36`	`36`	`// NetEventSource.Info(this, "literal string"); // arbitrary message with a literal string`
`@@ -103,7 +103,7 @@ public static void Enter(object? thisOrContextObject, FormattableString? formatt`
`103`	`103`	`{`
`104`	`104`	`DebugValidateArg(thisOrContextObject);`
`105`	`105`	`DebugValidateArg(formattableString);`
`106`		`- if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
	`106`	`+ if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/// <summary>Logs entrance to a method.</summary>`
`@@ -115,7 +115,7 @@ public static void Enter(object? thisOrContextObject, object arg0, [CallerMember`
`115`	`115`	`{`
`116`	`116`	`DebugValidateArg(thisOrContextObject);`
`117`	`117`	`DebugValidateArg(arg0);`
`118`		`- if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)})");`
	`118`	`+ if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)})");`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`/// <summary>Logs entrance to a method.</summary>`
`@@ -129,7 +129,7 @@ public static void Enter(object? thisOrContextObject, object arg0, object arg1,`
`129`	`129`	`DebugValidateArg(thisOrContextObject);`
`130`	`130`	`DebugValidateArg(arg0);`
`131`	`131`	`DebugValidateArg(arg1);`
`132`		`- if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)})");`
	`132`	`+ if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)})");`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/// <summary>Logs entrance to a method.</summary>`
`@@ -145,7 +145,7 @@ public static void Enter(object? thisOrContextObject, object arg0, object arg1,`
`145`	`145`	`DebugValidateArg(arg0);`
`146`	`146`	`DebugValidateArg(arg1);`
`147`	`147`	`DebugValidateArg(arg2);`
`148`		`- if (IsEnabled) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)}, {Format(arg2)})");`
	`148`	`+ if (Log.IsEnabled()) Log.Enter(IdOf(thisOrContextObject), memberName, $"({Format(arg0)}, {Format(arg1)}, {Format(arg2)})");`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`[Event(EnterEventId, Level = EventLevel.Informational, Keywords = Keywords.EnterExit)]`
`@@ -163,7 +163,7 @@ public static void Exit(object? thisOrContextObject, FormattableString? formatta`
`163`	`163`	`{`
`164`	`164`	`DebugValidateArg(thisOrContextObject);`
`165`	`165`	`DebugValidateArg(formattableString);`
`166`		`- if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
	`166`	`+ if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`/// <summary>Logs exit from a method.</summary>`
`@@ -175,7 +175,7 @@ public static void Exit(object? thisOrContextObject, object arg0, [CallerMemberN`
`175`	`175`	`{`
`176`	`176`	`DebugValidateArg(thisOrContextObject);`
`177`	`177`	`DebugValidateArg(arg0);`
`178`		`- if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, Format(arg0).ToString());`
	`178`	`+ if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, Format(arg0).ToString());`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`/// <summary>Logs exit from a method.</summary>`
`@@ -189,7 +189,7 @@ public static void Exit(object? thisOrContextObject, object arg0, object arg1, [`
`189`	`189`	`DebugValidateArg(thisOrContextObject);`
`190`	`190`	`DebugValidateArg(arg0);`
`191`	`191`	`DebugValidateArg(arg1);`
`192`		`- if (IsEnabled) Log.Exit(IdOf(thisOrContextObject), memberName, $"{Format(arg0)}, {Format(arg1)}");`
	`192`	`+ if (Log.IsEnabled()) Log.Exit(IdOf(thisOrContextObject), memberName, $"{Format(arg0)}, {Format(arg1)}");`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`[Event(ExitEventId, Level = EventLevel.Informational, Keywords = Keywords.EnterExit)]`
`@@ -207,7 +207,7 @@ public static void Info(object? thisOrContextObject, FormattableString? formatta`
`207`	`207`	`{`
`208`	`208`	`DebugValidateArg(thisOrContextObject);`
`209`	`209`	`DebugValidateArg(formattableString);`
`210`		`- if (IsEnabled) Log.Info(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
	`210`	`+ if (Log.IsEnabled()) Log.Info(IdOf(thisOrContextObject), memberName, formattableString != null ? Format(formattableString) : NoParameters);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`/// <summary>Logs an information message.</summary>`
`@@ -219,7 +219,7 @@ public static void Info(object? thisOrContextObject, object? message, [CallerMem`
`219`	`219`	`{`
`220`	`220`	`DebugValidateArg(thisOrContextObject);`
`221`	`221`	`DebugValidateArg(message);`
`222`		`- if (IsEnabled) Log.Info(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
	`222`	`+ if (Log.IsEnabled()) Log.Info(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`[Event(InfoEventId, Level = EventLevel.Informational, Keywords = Keywords.Default)]`
`@@ -237,7 +237,7 @@ public static void Error(object? thisOrContextObject, FormattableString formatta`
`237`	`237`	`{`
`238`	`238`	`DebugValidateArg(thisOrContextObject);`
`239`	`239`	`DebugValidateArg(formattableString);`
`240`		`- if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(formattableString));`
	`240`	`+ if (Log.IsEnabled()) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(formattableString));`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`/// <summary>Logs an error message.</summary>`
`@@ -249,7 +249,7 @@ public static void Error(object? thisOrContextObject, object message, [CallerMem`
`249`	`249`	`{`
`250`	`250`	`DebugValidateArg(thisOrContextObject);`
`251`	`251`	`DebugValidateArg(message);`
`252`		`- if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
	`252`	`+ if (Log.IsEnabled()) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`[Event(ErrorEventId, Level = EventLevel.Error, Keywords = Keywords.Default)]`
`@@ -268,7 +268,7 @@ public static void Fail(object? thisOrContextObject, FormattableString formattab`
`268`	`268`	`// Don't call DebugValidateArg on args, as we expect Fail to be used in assert/failure situations`
`269`	`269`	`// that should never happen in production, and thus we don't care about extra costs.`
`270`	`270`
`271`		`- if (IsEnabled) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(formattableString));`
	`271`	`+ if (Log.IsEnabled()) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(formattableString));`
`272`	`272`	`Debug.Fail(Format(formattableString), $"{IdOf(thisOrContextObject)}.{memberName}");`
`273`	`273`	`}`
`274`	`274`
`@@ -282,7 +282,7 @@ public static void Fail(object? thisOrContextObject, object message, [CallerMemb`
`282`	`282`	`// Don't call DebugValidateArg on args, as we expect Fail to be used in assert/failure situations`
`283`	`283`	`// that should never happen in production, and thus we don't care about extra costs.`
`284`	`284`
`285`		`- if (IsEnabled) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
	`285`	`+ if (Log.IsEnabled()) Log.CriticalFailure(IdOf(thisOrContextObject), memberName, Format(message).ToString());`
`286`	`286`	`Debug.Fail(Format(message).ToString(), $"{IdOf(thisOrContextObject)}.{memberName}");`
`287`	`287`	`}`
`288`	`288`
`@@ -311,7 +311,7 @@ public static void DumpBuffer(object? thisOrContextObject, byte[] buffer, [Calle`
`311`	`311`	`[NonEvent]`
`312`	`312`	`public static void DumpBuffer(object? thisOrContextObject, byte[] buffer, int offset, int count, [CallerMemberName] string? memberName = null)`
`313`	`313`	`{`
`314`		`- if (IsEnabled)`
	`314`	`+ if (Log.IsEnabled())`
`315`	`315`	`{`
`316`	`316`	`if (offset < 0 \|\| offset > buffer.Length - count)`
`317`	`317`	`{`
`@@ -343,7 +343,7 @@ public static unsafe void DumpBuffer(object? thisOrContextObject, IntPtr bufferP`
`343`	`343`	`Debug.Assert(bufferPtr != IntPtr.Zero);`
`344`	`344`	`Debug.Assert(count >= 0);`
`345`	`345`
`346`		`- if (IsEnabled)`
	`346`	`+ if (Log.IsEnabled())`
`347`	`347`	`{`
`348`	`348`	`var buffer = new byte[Math.Min(count, MaxDumpSize)];`
`349`	`349`	`fixed (byte* targetPtr = buffer)`
`@@ -369,7 +369,7 @@ public static void Associate(object first, object second, [CallerMemberName] str`
`369`	`369`	`{`
`370`	`370`	`DebugValidateArg(first);`
`371`	`371`	`DebugValidateArg(second);`
`372`		`- if (IsEnabled) Log.Associate(IdOf(first), memberName, IdOf(first), IdOf(second));`
	`372`	`+ if (Log.IsEnabled()) Log.Associate(IdOf(first), memberName, IdOf(first), IdOf(second));`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`/// <summary>Logs a relationship between two objects.</summary>`
`@@ -383,7 +383,7 @@ public static void Associate(object? thisOrContextObject, object first, object s`
`383`	`383`	`DebugValidateArg(thisOrContextObject);`
`384`	`384`	`DebugValidateArg(first);`
`385`	`385`	`DebugValidateArg(second);`
`386`		`- if (IsEnabled) Log.Associate(IdOf(thisOrContextObject), memberName, IdOf(first), IdOf(second));`
	`386`	`+ if (Log.IsEnabled()) Log.Associate(IdOf(thisOrContextObject), memberName, IdOf(first), IdOf(second));`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`[Event(AssociateEventId, Level = EventLevel.Informational, Keywords = Keywords.Default, Message = "[{2}]<-->[{3}]")]`
`@@ -396,7 +396,7 @@ private void Associate(string thisOrContextObject, string? memberName, string fi`
`396`	`396`	`[Conditional("DEBUG_NETEVENTSOURCE_MISUSE")]`
`397`	`397`	`private static void DebugValidateArg(object? arg)`
`398`	`398`	`{`
`399`		`- if (!IsEnabled)`
	`399`	`+ if (!Log.IsEnabled())`
`400`	`400`	`{`
`401`	`401`	`Debug.Assert(!(arg is ValueType), $"Should not be passing value type {arg?.GetType()} to logging without IsEnabled check");`
`402`	`402`	`Debug.Assert(!(arg is FormattableString), $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");`
`@@ -406,12 +406,9 @@ private static void DebugValidateArg(object? arg)`
`406`	`406`	`[Conditional("DEBUG_NETEVENTSOURCE_MISUSE")]`
`407`	`407`	`private static void DebugValidateArg(FormattableString? arg)`
`408`	`408`	`{`
`409`		`- Debug.Assert(IsEnabled \|\| arg == null, $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");`
	`409`	`+ Debug.Assert(Log.IsEnabled() \|\| arg == null, $"Should not be formatting FormattableString \"{arg}\" if tracing isn't enabled");`
`410`	`410`	`}`
`411`	`411`
`412`		`- public static new bool IsEnabled =>`
`413`		`- Log.IsEnabled();`
`414`		`-`
`415`	`412`	`[NonEvent]`
`416`	`413`	`public static string IdOf(object? value) => value != null ? value.GetType().Name + "#" + GetHashCode(value) : NullInstance;`
`417`	`414`
Original file line number	Diff line number	Diff line change
`@@ -51,20 +51,20 @@ internal sealed class MsQuicConnection : QuicConnectionProvider`
`51`	`51`	`// constructor for inbound connections`
`52`	`52`	`public MsQuicConnection(IPEndPoint localEndPoint, IPEndPoint remoteEndPoint, IntPtr nativeObjPtr)`
`53`	`53`	`{`
`54`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`54`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`55`	`55`	`_localEndPoint = localEndPoint;`
`56`	`56`	`_remoteEndPoint = remoteEndPoint;`
`57`	`57`	`_ptr = nativeObjPtr;`
`58`	`58`
`59`	`59`	`SetCallbackHandler();`
`60`	`60`	`SetIdleTimeout(TimeSpan.FromSeconds(120));`
`61`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`61`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// constructor for outbound connections`
`65`	`65`	`public MsQuicConnection(QuicClientConnectionOptions options)`
`66`	`66`	`{`
`67`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`67`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`68`	`68`
`69`	`69`	`// TODO need to figure out if/how we want to expose sessions`
`70`	`70`	`// Creating a session per connection isn't ideal.`
`@@ -75,7 +75,7 @@ public MsQuicConnection(QuicClientConnectionOptions options)`
`75`	`75`	`SetCallbackHandler();`
`76`	`76`	`SetIdleTimeout(options.IdleTimeout);`
`77`	`77`
`78`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`78`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`internal override IPEndPoint LocalEndPoint`
`@@ -168,7 +168,7 @@ internal uint HandleEvent(ref ConnectionEvent connectionEvent)`
`168`	`168`
`169`	`169`	`private uint HandleEventConnected(ConnectionEvent connectionEvent)`
`170`	`170`	`{`
`171`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`171`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`172`	`172`
`173`	`173`	`SOCKADDR_INET inetAddress = MsQuicParameterHelpers.GetINetParam(MsQuicApi.Api, _ptr, (uint)QUIC_PARAM_LEVEL.CONNECTION, (uint)QUIC_PARAM_CONN.LOCAL_ADDRESS);`
`174`	`174`	`_localEndPoint = MsQuicAddressHelpers.INetToIPEndPoint(inetAddress);`
`@@ -179,13 +179,13 @@ private uint HandleEventConnected(ConnectionEvent connectionEvent)`
`179`	`179`	`// handle event shutdown initiated by transport`
`180`	`180`	`_connectTcs.Complete(MsQuicStatusCodes.Success);`
`181`	`181`
`182`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`182`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`183`	`183`	`return MsQuicStatusCodes.Success;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`private uint HandleEventShutdownInitiatedByTransport(ConnectionEvent connectionEvent)`
`187`	`187`	`{`
`188`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`188`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`189`	`189`
`190`	`190`	`if (!_connected)`
`191`	`191`	`{`
`@@ -194,7 +194,7 @@ private uint HandleEventShutdownInitiatedByTransport(ConnectionEvent connectionE`
`194`	`194`
`195`	`195`	`_acceptQueue.Writer.Complete();`
`196`	`196`
`197`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`197`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`198`	`198`
`199`	`199`	`return MsQuicStatusCodes.Success;`
`200`	`200`	`}`
`@@ -208,22 +208,22 @@ private uint HandleEventShutdownInitiatedByPeer(ConnectionEvent connectionEvent)`
`208`	`208`
`209`	`209`	`private uint HandleEventShutdownComplete(ConnectionEvent connectionEvent)`
`210`	`210`	`{`
`211`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`211`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`212`	`212`
`213`	`213`	`_shutdownTcs.Complete(MsQuicStatusCodes.Success);`
`214`	`214`
`215`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`215`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`216`	`216`	`return MsQuicStatusCodes.Success;`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`private uint HandleEventNewStream(ConnectionEvent connectionEvent)`
`220`	`220`	`{`
`221`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`221`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`222`	`222`
`223`	`223`	`MsQuicStream msQuicStream = new MsQuicStream(this, connectionEvent.StreamFlags, connectionEvent.Data.NewStream.Stream, inbound: true);`
`224`	`224`
`225`	`225`	`_acceptQueue.Writer.TryWrite(msQuicStream);`
`226`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`226`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`227`	`227`
`228`	`228`	`return MsQuicStatusCodes.Success;`
`229`	`229`	`}`
`@@ -235,7 +235,7 @@ private uint HandleEventStreamsAvailable(ConnectionEvent connectionEvent)`
`235`	`235`
`236`	`236`	`internal override async ValueTask<QuicStreamProvider> AcceptStreamAsync(CancellationToken cancellationToken = default)`
`237`	`237`	`{`
`238`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`238`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`239`	`239`
`240`	`240`	`ThrowIfDisposed();`
`241`	`241`
`@@ -254,7 +254,7 @@ internal override async ValueTask<QuicStreamProvider> AcceptStreamAsync(Cancella`
`254`	`254`	`};`
`255`	`255`	`}`
`256`	`256`
`257`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`257`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`258`	`258`	`return stream;`
`259`	`259`	`}`
`260`	`260`
`@@ -305,7 +305,7 @@ internal override ValueTask ConnectAsync(CancellationToken cancellationToken = d`
`305`	`305`	`private MsQuicStream StreamOpen(`
`306`	`306`	`QUIC_STREAM_OPEN_FLAG flags)`
`307`	`307`	`{`
`308`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`308`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`309`	`309`
`310`	`310`	`IntPtr streamPtr = IntPtr.Zero;`
`311`	`311`	`QuicExceptionHelpers.ThrowIfFailed(`
`@@ -319,7 +319,7 @@ private MsQuicStream StreamOpen(`
`319`	`319`
`320`	`320`	`MsQuicStream stream = new MsQuicStream(this, flags, streamPtr, inbound: false);`
`321`	`321`
`322`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`322`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`323`	`323`	`return stream;`
`324`	`324`	`}`
`325`	`325`
`@@ -337,15 +337,15 @@ private ValueTask ShutdownAsync(`
`337`	`337`	`QUIC_CONNECTION_SHUTDOWN_FLAG Flags,`
`338`	`338`	`long ErrorCode)`
`339`	`339`	`{`
`340`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`340`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`341`	`341`
`342`	`342`	`uint status = MsQuicApi.Api.ConnectionShutdownDelegate(`
`343`	`343`	`_ptr,`
`344`	`344`	`(uint)Flags,`
`345`	`345`	`ErrorCode);`
`346`	`346`	`QuicExceptionHelpers.ThrowIfFailed(status, "Failed to shutdown connection.");`
`347`	`347`
`348`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`348`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`349`	`349`	`return _shutdownTcs.GetTypelessValueTask();`
`350`	`350`	`}`
`351`	`351`
`@@ -377,7 +377,7 @@ private void Dispose(bool disposing)`
`377`	`377`	`return;`
`378`	`378`	`}`
`379`	`379`
`380`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`380`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`381`	`381`
`382`	`382`	`if (_ptr != IntPtr.Zero)`
`383`	`383`	`{`
`@@ -395,7 +395,7 @@ private void Dispose(bool disposing)`
`395`	`395`
`396`	`396`	`_disposed = true;`
`397`	`397`
`398`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`398`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`internal override ValueTask CloseAsync(long errorCode, CancellationToken cancellationToken = default)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ internal override IPEndPoint ListenEndPoint`
`62`	`62`
`63`	`63`	`internal override async ValueTask<QuicConnectionProvider> AcceptConnectionAsync(CancellationToken cancellationToken = default)`
`64`	`64`	`{`
`65`		`- if (NetEventSource.IsEnabled) NetEventSource.Enter(this);`
	`65`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Enter(this);`
`66`	`66`
`67`	`67`	`ThrowIfDisposed();`
`68`	`68`
`@@ -81,7 +81,7 @@ await connection.SetSecurityConfigForConnection(_sslOptions.ServerCertificate!,`
`81`	`81`	`_options.CertificateFilePath,`
`82`	`82`	`_options.PrivateKeyFilePath).ConfigureAwait(false);`
`83`	`83`
`84`		`- if (NetEventSource.IsEnabled) NetEventSource.Exit(this);`
	`84`	`+ if (NetEventSource.Log.IsEnabled()) NetEventSource.Exit(this);`
`85`	`85`	`return connection;`
`86`	`86`	`}`
`87`	`87`