From f387d04af12fcfd5fc79d3c09c36df3cfbdefc41 Mon Sep 17 00:00:00 2001
From: Anthony van der Hoorn <anthony.vanderhoorn@gmail.com>
Date: Wed, 23 Mar 2016 16:37:54 -0700
Subject: [PATCH] Adds timestamp in accordance with hosting example, as well as
 duration

---
 .../AnalysisMiddleware.cs                     | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs
index 84ba7d885e..081f64f0ce 100644
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/AnalysisMiddleware.cs
@@ -28,9 +28,18 @@ namespace Microsoft.AspNetCore.MiddlewareAnalysis
 
         public async Task Invoke(HttpContext httpContext)
         {
+            var startTimestamp = Stopwatch.GetTimestamp();
             if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting"))
             {
-                _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting", new { name = _middlewareName, httpContext = httpContext, instanceId = _instanceId });
+                _diagnostics.Write(
+                    "Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareStarting",
+                    new
+                    {
+                        name = _middlewareName,
+                        httpContext = httpContext,
+                        instanceId = _instanceId,
+                        timestamp = startTimestamp,
+                    });
             }
 
             try
@@ -39,14 +48,35 @@ namespace Microsoft.AspNetCore.MiddlewareAnalysis
 
                 if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished"))
                 {
-                    _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished", new { name = _middlewareName, httpContext = httpContext, instanceId = _instanceId });
+                    var currentTimestamp = Stopwatch.GetTimestamp();
+                    _diagnostics.Write(
+                        "Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareFinished", 
+                        new
+                        {
+                            name = _middlewareName,
+                            httpContext = httpContext,
+                            instanceId = _instanceId,
+                            timestamp = currentTimestamp,
+                            duration = currentTimestamp - startTimestamp,
+                        });
                 }
             }
             catch (Exception ex)
             {
                 if (_diagnostics.IsEnabled("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException"))
                 {
-                    _diagnostics.Write("Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException", new { name = _middlewareName, httpContext = httpContext, instanceId = _instanceId, exception = ex });
+                    var currentTimestamp = Stopwatch.GetTimestamp();
+                    _diagnostics.Write(
+                        "Microsoft.AspNetCore.MiddlewareAnalysis.MiddlewareException", 
+                        new
+                        {
+                            name = _middlewareName,
+                            httpContext = httpContext,
+                            instanceId = _instanceId,
+                            timestamp = currentTimestamp,
+                            duration = currentTimestamp - startTimestamp,
+                            exception = ex,
+                        });
                 }
                 throw;
             }