Remove KestrelEventSource events with broken ActivityId tracking (dot…

…net#26684) * Remove KestrelEventSource events with broken ActivityId tracking * Skip test requiring ALPN on macOS
StevenRasmussen · Oct 8, 2020 · 053052d · 053052d
1 parent 95b0518
commit 053052d
Show file tree

Hide file tree

Showing 8 changed files with 459 additions and 137 deletions.
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelEventSource.cs
@@ -144,54 +144,12 @@ public void ConnectionRejected(string connectionId)
         public void ConnectionQueuedStart(BaseConnectionContext connection)
         {
             Interlocked.Increment(ref _connectionQueueLength);
-            if (IsEnabled())
-            {
-                ConnectionQueuedStart(
-                    connection.ConnectionId,
-                    connection.LocalEndPoint?.ToString(),
-                    connection.RemoteEndPoint?.ToString());
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(6, Level = EventLevel.Informational)]
-        private void ConnectionQueuedStart(string connectionId,
-            string localEndPoint,
-            string remoteEndPoint)
-        {
-            WriteEvent(
-                6,
-                connectionId,
-                localEndPoint,
-                remoteEndPoint
-            );
         }
 
         [NonEvent]
         public void ConnectionQueuedStop(BaseConnectionContext connection)
         {
             Interlocked.Decrement(ref _connectionQueueLength);
-            if (IsEnabled())
-            {
-                ConnectionQueuedStop(
-                    connection.ConnectionId,
-                    connection.LocalEndPoint?.ToString(),
-                    connection.RemoteEndPoint?.ToString());
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(7, Level = EventLevel.Informational)]
-        private void ConnectionQueuedStop(string connectionId,
-            string localEndPoint,
-            string remoteEndPoint)
-        {
-            WriteEvent(
-                7,
-                connectionId,
-                localEndPoint,
-                remoteEndPoint
-            );
         }
 
         [NonEvent]
@@ -245,70 +203,24 @@ public void TlsHandshakeFailed(string connectionId)
         public void RequestQueuedStart(HttpProtocol httpProtocol, string httpVersion)
         {
             Interlocked.Increment(ref _httpRequestQueueLength);
-            // avoid allocating the trace identifier unless logging is enabled
-            if (IsEnabled())
-            {
-                RequestQueuedStart(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpVersion);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(11, Level = EventLevel.Informational)]
-        private void RequestQueuedStart(string connectionId, string requestId, string httpVersion)
-        {
-            WriteEvent(11, connectionId, requestId, httpVersion);
         }
 
         [NonEvent]
         public void RequestQueuedStop(HttpProtocol httpProtocol, string httpVersion)
         {
             Interlocked.Decrement(ref _httpRequestQueueLength);
-            // avoid allocating the trace identifier unless logging is enabled
-            if (IsEnabled())
-            {
-                RequestQueuedStop(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpVersion);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(12, Level = EventLevel.Informational)]
-        private void RequestQueuedStop(string connectionId, string requestId, string httpVersion)
-        {
-            WriteEvent(12, connectionId, requestId, httpVersion);
         }
 
         [NonEvent]
         public void RequestUpgradedStart(HttpProtocol httpProtocol)
         {
             Interlocked.Increment(ref _currentUpgradedHttpRequests);
-            if (IsEnabled())
-            {
-                RequestUpgradedStart(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpProtocol.HttpVersion, httpProtocol.Path, httpProtocol.MethodText);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(13, Level = EventLevel.Informational)]
-        private void RequestUpgradedStart(string connectionId, string requestId, string httpVersion, string path, string method)
-        {
-            WriteEvent(13, connectionId, requestId, httpVersion, path, method);
         }
 
         [NonEvent]
         public void RequestUpgradedStop(HttpProtocol httpProtocol)
         {
             Interlocked.Decrement(ref _currentUpgradedHttpRequests);
-            if (IsEnabled())
-            {
-                RequestUpgradedStop(httpProtocol.ConnectionIdFeature, httpProtocol.TraceIdentifier, httpProtocol.HttpVersion, httpProtocol.Path, httpProtocol.MethodText);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        [Event(14, Level = EventLevel.Informational)]
-        private void RequestUpgradedStop(string connectionId, string requestId, string httpVersion, string path, string method)
-        {
-            WriteEvent(14, connectionId, requestId, httpVersion, path, method);
         }
 
         protected override void OnEventCommand(EventCommandEventArgs command)

diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
@@ -36,7 +36,7 @@ public HandshakeTests()
 
         [ConditionalFact]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.Windows)]
-        // Mac SslStream is missing ALPN support: https://github.com/dotnet/corefx/issues/30492
+        // Mac SslStream is missing ALPN support: https://github.com/dotnet/runtime/issues/27727
         public void TlsAndHttp2NotSupportedOnMac()
         {
             var ex = Assert.Throws<NotSupportedException>(() => new TestServer(context =>
@@ -79,7 +79,7 @@ public void TlsAndHttp2NotSupportedOnWin7()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
+        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
         [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
         public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
         {
@@ -107,7 +107,7 @@ public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
         }
 
         [ConditionalFact]
-        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
+        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
         [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
         public async Task TlsAlpnHandshakeSelectsHttp2()
         {

diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -21,7 +21,7 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
 {
-    [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
+    [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/runtime/issues/27727")]
     [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
     public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
     {