TryAdd

Author: DeagleGross

src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs

@@ -21,7 +21,7 @@ private static partial class Log
         [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to parse request.", EventName = "RequestParsingError")]
         public static partial void RequestParsingError(ILogger logger, Exception exception);
 
-        [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to invoke QueryTlsClientHello: Win32 Error code: {Win32Error}", EventName = "TlsClientHelloRetrieveError")]
-        public static partial void TlsClientHelloRetrieveError(ILogger logger, uint win32Error);    
+        [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to invoke QueryTlsClientHello; RequestId: {RequestId}; Win32 Error code: {Win32Error}", EventName = "TlsClientHelloRetrieveError")]
+        public static partial void TlsClientHelloRetrieveError(ILogger logger, ulong requestId, uint win32Error);
     }
 }

src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs

@@ -303,7 +303,7 @@ internal unsafe bool GetAndInvokeTlsClientHelloMessageBytesCallback(IFeatureColl
             }
         }
 
-        Log.TlsClientHelloRetrieveError(Logger, statusCode);
+        Log.TlsClientHelloRetrieveError(Logger, requestId, statusCode);
         return false;
     }
 

src/Servers/HttpSys/src/RequestProcessing/TlsListener.cs

@@ -34,17 +34,13 @@ internal void InvokeTlsClientHelloCallback(IFeatureCollection features, Request
             return;
         }
 
-        if (_connectionTimestamps.ContainsKey(request.RawConnectionId))
+        if (!_connectionTimestamps.TryAdd(request.RawConnectionId, DateTime.UtcNow))
         {
-            _connectionTimestamps[request.RawConnectionId] = DateTime.UtcNow;
+            _connectionTimestamps[request.RawConnectionId] = DateTime.UtcNow; // update TTL
             return;
         }
 
-        var success = request.GetAndInvokeTlsClientHelloCallback(features, _tlsClientHelloBytesCallback);
-        if (success)
-        {
-            _connectionTimestamps[request.RawConnectionId] = DateTime.UtcNow;
-        }
+        _ = request.GetAndInvokeTlsClientHelloCallback(features, _tlsClientHelloBytesCallback);
     }
 
     private async Task CleanupLoopAsync()