updated

Author: kichalla

src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs

@@ -59,10 +59,11 @@ public void DisposeContext(Context context, Exception exception)
         {
             var httpContext = context.HttpContext;
 
+            long currentTimestamp;
             if (exception == null)
             {
                 var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.EndRequest");
-                var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
+                currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
 
                 _logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
 
@@ -76,7 +77,7 @@ public void DisposeContext(Context context, Exception exception)
             else
             {
                 var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.UnhandledException");
-                var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
+                currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
 
                 _logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
 
@@ -88,7 +89,7 @@ public void DisposeContext(Context context, Exception exception)
                 HostingEventSource.Log.UnhandledException();
             }
 
-            HostingEventSource.Log.RequestStop();
+            HostingEventSource.Log.RequestStop(context.StartTimestamp, currentTimestamp);
 
             context.Scope?.Dispose();
 

src/Microsoft.AspNetCore.Hosting/Internal/HostingEventSource.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Diagnostics.Tracing;
-using Microsoft.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Hosting.Internal
 {
@@ -53,56 +52,37 @@ public void RequestStart(string method, string path)
 #if NETSTANDARD1_5
             _requestCounter.WriteMetric(1);
 #endif
-            if (IsEnabled())
-            {
-                RequestStart(
-                    context.TraceIdentifier,
-                    context.Request.Protocol,
-                    context.Request.Method,
-                    context.Request.ContentType ?? string.Empty,
-                    context.Request.ContentLength.HasValue ? context.Request.ContentLength.Value.ToString() : string.Empty,
-                    context.Request.Scheme,
-                    context.Request.Host.ToString(),
-                    context.Request.PathBase,
-                    context.Request.Path,
-                    context.Request.QueryString.ToString());
-            }
             WriteEvent(3, method, path);
         }
 
-        [Event(4, Level = EventLevel.Informational)]
-        public void RequestStop()
+        [NonEvent]
+        public void RequestStop(long startTimestamp, long endTimestamp)
         {
 #if NETSTANDARD1_5
-            if (exception == null)
-            {
-                _successfulRequestCounter.WriteMetric(1);
-            }
-            else
-            {
-                _failedRequestCounter.WriteMetric(1);
-            }
+            _successfulRequestCounter.WriteMetric(1);
 
             if (endTimestamp != 0)
             {
                 _requestExecutionTimeCounter.WriteMetric(endTimestamp - startTimestamp);
             }
 #endif
-            if (IsEnabled())
-            {
-                RequestStop(
-                    context.Response.StatusCode,
-                    context.Response.ContentType ?? string.Empty,
-                    context.TraceIdentifier,
-                    exception == null ? string.Empty : exception.ToString());
-            }
+            RequestStop();
+        }
+
+        [Event(4, Level = EventLevel.Informational)]
+        private void RequestStop()
+        {
             WriteEvent(4);
         }
 
         [Event(5, Level = EventLevel.Error)]
         public void UnhandledException()
         {
+#if NETSTANDARD1_5
+            _failedRequestCounter.WriteMetric(1);
+#endif
             WriteEvent(5);
         }
+
     }
 }