Merge pull request #80 from Microsoft/sergkanz/failedRequests

mark request as failed for runaway exceptions
microsoft · May 14, 2015 · 06fe58d · 06fe58d
2 parents f59e449 + 6921020
commit 06fe58d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/src/Microsoft.ApplicationInsights.AspNet/RequestTrackingMiddleware.cs b/src/Microsoft.ApplicationInsights.AspNet/RequestTrackingMiddleware.cs
@@ -1,15 +1,12 @@
 namespace Microsoft.ApplicationInsights.AspNet
 {
     using System;
-    using System.Linq;
-    using System.Reflection;
     using System.Diagnostics;
     using System.Threading.Tasks;
     using Microsoft.ApplicationInsights;
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.AspNet.Builder;
     using Microsoft.AspNet.Http;
-    using Microsoft.Framework.DependencyInjection;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
     using Microsoft.ApplicationInsights.AspNet.Extensions;
 
@@ -32,31 +29,34 @@ public RequestTrackingMiddleware(RequestDelegate next, TelemetryClient client)
 
         public async Task Invoke(HttpContext httpContext, RequestTelemetry telemetry)
         {
+            telemetry.Timestamp = DateTimeOffset.UtcNow;
+
             var sw = new Stopwatch();
             sw.Start();
 
-            var now = DateTimeOffset.UtcNow;
+            bool requestFailed = false;
 
             try
             {
                 await this.next.Invoke(httpContext);
             }
+            catch (Exception)
+            {
+                requestFailed = true;
+                throw;
+            }
             finally
             {
-                if (this.telemetryClient != null)
-                {
-                    sw.Stop();
+                sw.Stop();
 
-                    telemetry.Timestamp = now;
-                    telemetry.Duration = sw.Elapsed;
-                    telemetry.ResponseCode = httpContext.Response.StatusCode.ToString();
-                    telemetry.Success = httpContext.Response.StatusCode < 400;
-                    telemetry.HttpMethod = httpContext.Request.Method;
-                    telemetry.Url = httpContext.Request.GetUri();
-                    telemetry.Context.GetInternalContext().SdkVersion = this.sdkVersion;
+                telemetry.Duration = sw.Elapsed;
+                telemetry.ResponseCode = httpContext.Response.StatusCode.ToString();
+                telemetry.Success = (!requestFailed) && (httpContext.Response.StatusCode < 400);
+                telemetry.HttpMethod = httpContext.Request.Method;
+                telemetry.Url = httpContext.Request.GetUri();
+                telemetry.Context.GetInternalContext().SdkVersion = this.sdkVersion;
 
-                    this.telemetryClient.TrackRequest(telemetry);
-                }
+                this.telemetryClient.TrackRequest(telemetry);
             }
         }
     }

diff --git a/test/Microsoft.ApplicationInsights.AspNet.Tests/RequestTrackingMiddlewareTest.cs b/test/Microsoft.ApplicationInsights.AspNet.Tests/RequestTrackingMiddlewareTest.cs
@@ -1,15 +1,15 @@
 namespace Microsoft.ApplicationInsights.AspNet
 {
+    using System;
     using System.Threading.Tasks;
     using Microsoft.ApplicationInsights.AspNet.Tests.Helpers;
     using Microsoft.ApplicationInsights.Channel;
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
     using Microsoft.AspNet.Builder;
+    using Microsoft.AspNet.Http;
     using Microsoft.AspNet.Http.Core;
     using Xunit;
-    using Microsoft.AspNet.Http;
-    using System;
 
     public class RequestTrackingMiddlewareTest
     {
@@ -67,5 +67,22 @@ public async Task TestRequestUriIsPopulatedByMiddleware()
                 new Uri(string.Format("{0}://{1}{2}{3}", HttpRequestScheme, httpRequestHost.Value, httpRequestPath.Value, httpRequestQueryString.Value)), 
                 telemetry.Url);
         }
+
+        [Fact]
+        public async Task RequestWillBeMarkedAsFailedForRunawayException()
+        {
+            var context = new DefaultHttpContext();
+            context.Request.Scheme = HttpRequestScheme;
+            context.Request.Host = this.httpRequestHost;
+
+            var requestMiddleware = new RequestTrackingMiddleware(
+                httpContext => { throw new InvalidOperationException(); },
+                CommonMocks.MockTelemetryClient(telemetry => this.sentTelemetry = telemetry));
+
+
+            await Assert.ThrowsAsync<InvalidOperationException>(async () => { await requestMiddleware.Invoke(context, new RequestTelemetry()); } );
+
+            Assert.False(((RequestTelemetry)this.sentTelemetry).Success);
+        }
     }
 }
diff --git a/test/WebApiShimFw46.FunctionalTests/FunctionalTest/ExceptionTelemetryTests.cs b/test/WebApiShimFw46.FunctionalTests/FunctionalTest/ExceptionTelemetryTests.cs
@@ -25,7 +25,7 @@ public void TestBasicRequestPropertiesAfterRequestingControllerThatThrows()
                 //TODO: default template of Web API applicaiton doesn't have error handling middleware 
                 //that will set appropriate status code
                 expectedRequestTelemetry.ResponseCode = "200";
-                expectedRequestTelemetry.Success = true;
+                expectedRequestTelemetry.Success = false;
                 expectedRequestTelemetry.Url = new System.Uri(server.BaseHost + RequestPath);
 
                 this.ValidateBasicRequest(server, RequestPath, expectedRequestTelemetry);