huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up DiagnosticSource code in invoker

This commit is contained in:
Ryan Nowak 2016-05-11 17:38:49 -07:00
parent 7bd297c395
commit 04ffc4d2eb
2 changed files with 36 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs
View File

@ -176,15 +176,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
var current = _cursor.GetNextFilter<IAuthorizationFilter, IAsyncAuthorizationFilter>(); var current = _cursor.GetNextFilter<IAuthorizationFilter, IAsyncAuthorizationFilter>();
if (current.FilterAsync != null) if (current.FilterAsync != null)
{ {
_diagnosticSource.BeforeOnAuthorizationAsync( _diagnosticSource.BeforeOnAuthorizationAsync(_authorizationContext, current.FilterAsync);
_authorizationContext,
current.FilterAsync);
await current.FilterAsync.OnAuthorizationAsync(_authorizationContext); await current.FilterAsync.OnAuthorizationAsync(_authorizationContext);
_diagnosticSource.AfterOnAuthorizationAsync( _diagnosticSource.AfterOnAuthorizationAsync(_authorizationContext, current.FilterAsync);
_authorizationContext,
current.FilterAsync);
if (_authorizationContext.Result == null) if (_authorizationContext.Result == null)
{ {
@ -198,15 +194,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else if (current.Filter != null) else if (current.Filter != null)
{ {
_diagnosticSource.BeforeOnAuthorization( _diagnosticSource.BeforeOnAuthorization(_authorizationContext, current.Filter);
_authorizationContext,
current.Filter);
current.Filter.OnAuthorization(_authorizationContext); current.Filter.OnAuthorization(_authorizationContext);
_diagnosticSource.AfterOnAuthorization( _diagnosticSource.AfterOnAuthorization(_authorizationContext, current.Filter);
_authorizationContext,
current.Filter);
if (_authorizationContext.Result == null) if (_authorizationContext.Result == null)
{ {
@ -254,18 +246,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
if (item.FilterAsync != null) if (item.FilterAsync != null)
{ {
_diagnosticSource.BeforeOnResourceExecution( _diagnosticSource.BeforeOnResourceExecution(_resourceExecutingContext, item.FilterAsync);
_resourceExecutingContext,
item.FilterAsync);
await item.FilterAsync.OnResourceExecutionAsync( await item.FilterAsync.OnResourceExecutionAsync(_resourceExecutingContext, InvokeResourceFilterAsync);
_resourceExecutingContext,
InvokeResourceFilterAsync);
_diagnosticSource.AfterOnResourceExecution( _diagnosticSource.AfterOnResourceExecution(_resourceExecutedContext, item.FilterAsync);
_resourceExecutingContext.ActionDescriptor,
_resourceExecutedContext,
item.FilterAsync);
if (_resourceExecutedContext == null) if (_resourceExecutedContext == null)
{ {
@ -286,15 +271,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else if (item.Filter != null) else if (item.Filter != null)
{ {
_diagnosticSource.BeforeOnResourceExecuting( _diagnosticSource.BeforeOnResourceExecuting(_resourceExecutingContext, item.Filter);
_resourceExecutingContext,
item.Filter);
item.Filter.OnResourceExecuting(_resourceExecutingContext); item.Filter.OnResourceExecuting(_resourceExecutingContext);
_diagnosticSource.AfterOnResourceExecuting( _diagnosticSource.AfterOnResourceExecuting(_resourceExecutingContext, item.Filter);
_resourceExecutingContext,
item.Filter);
if (_resourceExecutingContext.Result != null) if (_resourceExecutingContext.Result != null)
{ {
@ -311,17 +292,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
_diagnosticSource.BeforeOnResourceExecuted( _diagnosticSource.BeforeOnResourceExecuted(_resourceExecutedContext, item.Filter);
_resourceExecutingContext.ActionDescriptor,
_resourceExecutedContext,
item.Filter);
item.Filter.OnResourceExecuted(await InvokeResourceFilterAsync()); item.Filter.OnResourceExecuted(await InvokeResourceFilterAsync());
_diagnosticSource.AfterOnResourceExecuted( _diagnosticSource.AfterOnResourceExecuted(_resourceExecutedContext, item.Filter);
_resourceExecutingContext.ActionDescriptor,
_resourceExecutedContext,
item.Filter);
} }
} }
else else
@ -416,17 +391,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
Debug.Assert(_exceptionContext != null); Debug.Assert(_exceptionContext != null);
if (_exceptionContext.Exception != null) if (_exceptionContext.Exception != null)
{ {
_diagnosticSource.BeforeOnExceptionAsync( _diagnosticSource.BeforeOnExceptionAsync(_exceptionContext, current.FilterAsync);
_exceptionContext,
current.FilterAsync);
// Exception filters only run when there's an exception - unsetting it will short-circuit // Exception filters only run when there's an exception - unsetting it will short-circuit
// other exception filters. // other exception filters.
await current.FilterAsync.OnExceptionAsync(_exceptionContext); await current.FilterAsync.OnExceptionAsync(_exceptionContext);
_diagnosticSource.AfterOnExceptionAsync( _diagnosticSource.AfterOnExceptionAsync(_exceptionContext, current.FilterAsync);
_exceptionContext,
current.FilterAsync);
if (_exceptionContext.Exception == null) if (_exceptionContext.Exception == null)
{ {
@ -443,17 +414,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
Debug.Assert(_exceptionContext != null); Debug.Assert(_exceptionContext != null);
if (_exceptionContext.Exception != null) if (_exceptionContext.Exception != null)
{ {
_diagnosticSource.BeforeOnException( _diagnosticSource.BeforeOnException(_exceptionContext, current.Filter);
_exceptionContext,
current.Filter);
// Exception filters only run when there's an exception - unsetting it will short-circuit // Exception filters only run when there's an exception - unsetting it will short-circuit
// other exception filters. // other exception filters.
current.Filter.OnException(_exceptionContext); current.Filter.OnException(_exceptionContext);
_diagnosticSource.AfterOnException( _diagnosticSource.AfterOnException(_exceptionContext, current.Filter);
_exceptionContext,
current.Filter);
if (_exceptionContext.Exception == null) if (_exceptionContext.Exception == null)
{ {
@ -530,16 +497,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
{ {
if (item.FilterAsync != null) if (item.FilterAsync != null)
{ {
_diagnosticSource.BeforeOnActionExecution( _diagnosticSource.BeforeOnActionExecution(_actionExecutingContext, item.FilterAsync);
_actionExecutingContext,
item.FilterAsync);
await item.FilterAsync.OnActionExecutionAsync(_actionExecutingContext, InvokeActionFilterAsync); await item.FilterAsync.OnActionExecutionAsync(_actionExecutingContext, InvokeActionFilterAsync);
_diagnosticSource.AfterOnActionExecution( _diagnosticSource.AfterOnActionExecution(_actionExecutedContext, item.FilterAsync);
_actionExecutingContext.ActionDescriptor,
_actionExecutedContext,
item.FilterAsync);
if (_actionExecutedContext == null) if (_actionExecutedContext == null)
{ {
@ -558,15 +520,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else if (item.Filter != null) else if (item.Filter != null)
{ {
_diagnosticSource.BeforeOnActionExecuting( _diagnosticSource.BeforeOnActionExecuting(_actionExecutingContext, item.Filter);
_actionExecutingContext,
item.Filter);
item.Filter.OnActionExecuting(_actionExecutingContext); item.Filter.OnActionExecuting(_actionExecutingContext);
_diagnosticSource.AfterOnActionExecuting( _diagnosticSource.AfterOnActionExecuting(_actionExecutingContext, item.Filter);
_actionExecutingContext,
item.Filter);
if (_actionExecutingContext.Result != null) if (_actionExecutingContext.Result != null)
{ {
@ -584,17 +542,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
_diagnosticSource.BeforeOnActionExecuted( _diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter);
_actionExecutingContext.ActionDescriptor,
_actionExecutedContext,
item.Filter);
item.Filter.OnActionExecuted(await InvokeActionFilterAsync()); item.Filter.OnActionExecuted(await InvokeActionFilterAsync());
_diagnosticSource.BeforeOnActionExecuted( _diagnosticSource.BeforeOnActionExecuted(_actionExecutedContext, item.Filter);
_actionExecutingContext.ActionDescriptor,
_actionExecutedContext,
item.Filter);
} }
} }
else else
@ -686,16 +638,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
var item = _cursor.GetNextFilter<IResultFilter, IAsyncResultFilter>(); var item = _cursor.GetNextFilter<IResultFilter, IAsyncResultFilter>();
if (item.FilterAsync != null) if (item.FilterAsync != null)
{ {
_diagnosticSource.BeforeOnResultExecution( _diagnosticSource.BeforeOnResultExecution(_resultExecutingContext, item.FilterAsync);
_resultExecutingContext,
item.FilterAsync);
await item.FilterAsync.OnResultExecutionAsync(_resultExecutingContext, InvokeResultFilterAsync); await item.FilterAsync.OnResultExecutionAsync(_resultExecutingContext, InvokeResultFilterAsync);
_diagnosticSource.AfterOnResultExecution( _diagnosticSource.AfterOnResultExecution(_resultExecutedContext, item.FilterAsync);
_resultExecutingContext.ActionDescriptor,
_resultExecutedContext,
item.FilterAsync);
if (_resultExecutedContext == null || _resultExecutingContext.Cancel == true) if (_resultExecutedContext == null || _resultExecutingContext.Cancel == true)
{ {
@ -714,15 +661,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else if (item.Filter != null) else if (item.Filter != null)
{ {
_diagnosticSource.BeforeOnResultExecuting( _diagnosticSource.BeforeOnResultExecuting(_resultExecutingContext, item.Filter);
_resultExecutingContext,
item.Filter);
item.Filter.OnResultExecuting(_resultExecutingContext); item.Filter.OnResultExecuting(_resultExecutingContext);
_diagnosticSource.AfterOnResultExecuting( _diagnosticSource.AfterOnResultExecuting(_resultExecutingContext, item.Filter);
_resultExecutingContext,
item.Filter);
if (_resultExecutingContext.Cancel == true) if (_resultExecutingContext.Cancel == true)
{ {
@ -740,17 +683,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
} }
else else
{ {
_diagnosticSource.BeforeOnResultExecuted( _diagnosticSource.BeforeOnResultExecuted(_resultExecutedContext, item.Filter);
_resultExecutingContext.ActionDescriptor,
_resultExecutedContext,
item.Filter);
item.Filter.OnResultExecuted(await InvokeResultFilterAsync()); item.Filter.OnResultExecuted(await InvokeResultFilterAsync());
_diagnosticSource.AfterOnResultExecuted( _diagnosticSource.AfterOnResultExecuted(_resultExecutedContext, item.Filter);
_resultExecutingContext.ActionDescriptor,
_resultExecutedContext,
item.Filter);
} }
} }
else else

27
src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs
View File

@ -132,7 +132,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnResourceExecution( public static void AfterOnResourceExecution(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResourceExecutedContext resourceExecutedContext, ResourceExecutedContext resourceExecutedContext,
IAsyncResourceFilter filter) IAsyncResourceFilter filter)
{ {
@ -142,7 +141,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnResourceExecution", "Microsoft.AspNetCore.Mvc.AfterOnResourceExecution",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resourceExecutedContext.ActionDescriptor,
resourceExecutedContext = resourceExecutedContext, resourceExecutedContext = resourceExecutedContext,
filter = filter filter = filter
}); });
@ -187,7 +186,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void BeforeOnResourceExecuted( public static void BeforeOnResourceExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResourceExecutedContext resourceExecutedContext, ResourceExecutedContext resourceExecutedContext,
IResourceFilter filter) IResourceFilter filter)
{ {
@ -197,7 +195,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuted", "Microsoft.AspNetCore.Mvc.BeforeOnResourceExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resourceExecutedContext.ActionDescriptor,
resourceExecutedContext = resourceExecutedContext, resourceExecutedContext = resourceExecutedContext,
filter = filter filter = filter
}); });
@ -206,7 +204,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnResourceExecuted( public static void AfterOnResourceExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResourceExecutedContext resourceExecutedContext, ResourceExecutedContext resourceExecutedContext,
IResourceFilter filter) IResourceFilter filter)
{ {
@ -216,7 +213,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnResourceExecuted", "Microsoft.AspNetCore.Mvc.AfterOnResourceExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resourceExecutedContext.ActionDescriptor,
resourceExecutedContext = resourceExecutedContext, resourceExecutedContext = resourceExecutedContext,
filter = filter filter = filter
}); });
@ -315,7 +312,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnActionExecution( public static void AfterOnActionExecution(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ActionExecutedContext actionExecutedContext, ActionExecutedContext actionExecutedContext,
IAsyncActionFilter filter) IAsyncActionFilter filter)
{ {
@ -325,7 +321,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnActionExecution", "Microsoft.AspNetCore.Mvc.AfterOnActionExecution",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = actionExecutedContext.ActionDescriptor,
actionExecutedContext = actionExecutedContext, actionExecutedContext = actionExecutedContext,
filter = filter filter = filter
}); });
@ -370,7 +366,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void BeforeOnActionExecuted( public static void BeforeOnActionExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ActionExecutedContext actionExecutedContext, ActionExecutedContext actionExecutedContext,
IActionFilter filter) IActionFilter filter)
{ {
@ -380,7 +375,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted", "Microsoft.AspNetCore.Mvc.BeforeOnActionExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = actionExecutedContext.ActionDescriptor,
actionExecutedContext = actionExecutedContext, actionExecutedContext = actionExecutedContext,
filter = filter filter = filter
}); });
@ -389,7 +384,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnActionExecuted( public static void AfterOnActionExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ActionExecutedContext actionExecutedContext, ActionExecutedContext actionExecutedContext,
IActionFilter filter) IActionFilter filter)
{ {
@ -399,7 +393,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnActionExecuted", "Microsoft.AspNetCore.Mvc.AfterOnActionExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = actionExecutedContext.ActionDescriptor,
actionExecutedContext = actionExecutedContext, actionExecutedContext = actionExecutedContext,
filter = filter filter = filter
}); });
@ -466,7 +460,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnResultExecution( public static void AfterOnResultExecution(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResultExecutedContext resultExecutedContext, ResultExecutedContext resultExecutedContext,
IAsyncResultFilter filter) IAsyncResultFilter filter)
{ {
@ -476,7 +469,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnResultExecution", "Microsoft.AspNetCore.Mvc.AfterOnResultExecution",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resultExecutedContext.ActionDescriptor,
resultExecutedContext = resultExecutedContext, resultExecutedContext = resultExecutedContext,
filter = filter filter = filter
}); });
@ -521,7 +514,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void BeforeOnResultExecuted( public static void BeforeOnResultExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResultExecutedContext resultExecutedContext, ResultExecutedContext resultExecutedContext,
IResultFilter filter) IResultFilter filter)
{ {
@ -531,7 +523,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.BeforeOnResultExecuted", "Microsoft.AspNetCore.Mvc.BeforeOnResultExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resultExecutedContext.ActionDescriptor,
resultExecutedContext = resultExecutedContext, resultExecutedContext = resultExecutedContext,
filter = filter filter = filter
}); });
@ -540,7 +532,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public static void AfterOnResultExecuted( public static void AfterOnResultExecuted(
this DiagnosticSource diagnosticSource, this DiagnosticSource diagnosticSource,
ActionDescriptor actionDescriptor,
ResultExecutedContext resultExecutedContext, ResultExecutedContext resultExecutedContext,
IResultFilter filter) IResultFilter filter)
{ {
@ -550,7 +541,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
"Microsoft.AspNetCore.Mvc.AfterOnResultExecuted", "Microsoft.AspNetCore.Mvc.AfterOnResultExecuted",
new new
{ {
actionDescriptor = actionDescriptor, actionDescriptor = resultExecutedContext.ActionDescriptor,
resultExecutedContext = resultExecutedContext, resultExecutedContext = resultExecutedContext,
filter = filter filter = filter
}); });