Bring arguments inline between before/after events

aspnet · Oct 5, 2015 · a0764fa · a0764fa
1 parent 32c174c
commit a0764fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs
@@ -625,7 +625,12 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
                         {
                             _telemetry.WriteTelemetry(
                                 "Microsoft.AspNet.Mvc.BeforeActionMethod",
-                                new { actionContext = ActionContext, arguments = _actionExecutingContext.ActionArguments });
+                                new
+                                {
+                                    actionContext = ActionContext, 
+                                    arguments = _actionExecutingContext.ActionArguments,
+                                    controller = _actionExecutingContext.Controller
+                                });
                         }
 
                         result = await InvokeActionAsync(_actionExecutingContext);
@@ -636,7 +641,13 @@ private async Task<ActionExecutedContext> InvokeActionFilterAsync()
                         {
                             _telemetry.WriteTelemetry(
                                 "Microsoft.AspNet.Mvc.AfterActionMethod",
-                                new { actionContext = ActionContext, result = result });
+                                new
+                                {
+                                    actionContext = ActionContext,
+                                    arguments = _actionExecutingContext.ActionArguments,
+                                    controller = _actionExecutingContext.Controller,
+                                    result = result
+                                });
                         }
                     }
 

diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs
@@ -101,7 +101,7 @@ public async Task RouteAsync(RouteContext context)
                 {
                     _telemetry.WriteTelemetry(
                         "Microsoft.AspNet.Mvc.AfterAction",
-                        new { actionDescriptor, httpContext = context.HttpContext });
+                        new { actionDescriptor, httpContext = context.HttpContext, routeData = context.RouteData });
                 }
 
                 if (!context.IsHandled)