DevDiv bug 388519 --[Monitoring] HttpActionBindingTracer was not created, and tracing did not show the roll-up of model binding results.

roncain · roncain · commit f351672299a1 · 2012-04-03T05:09:17.000-07:00
diff --git a/src/System.Web.Http/Tracing/Tracers/ActionValueBinderTracer.cs b/src/System.Web.Http/Tracing/Tracers/ActionValueBinderTracer.cs
@@ -34,8 +34,12 @@ HttpActionBinding IActionValueBinder.GetBinding(HttpActionDescriptor actionDescr
                                             : (HttpParameterBinding)new HttpParameterBindingTracer(parameterBinding, _traceWriter);
             }
 
-            HttpActionBinding newActionBinding = new HttpActionBinding(actionDescriptor, newParameterBindings);
-            return newActionBinding;
+            // Replace the inner HttpActionBinding's parameter bindings with our tracing versions.
+            // This allows each individual parameter binding to trace.
+            actionBinding.ParameterBindings = newParameterBindings;
+
+            // Then create an HttpActionBindingTracer to wrap the actual HttpActionBinding
+            return new HttpActionBindingTracer(actionBinding, _traceWriter);
         }
     }
 }
diff --git a/src/System.Web.Http/Tracing/Tracers/HttpActionBindingTracer.cs b/src/System.Web.Http/Tracing/Tracers/HttpActionBindingTracer.cs
@@ -16,6 +16,18 @@ public HttpActionBindingTracer(HttpActionBinding innerBinding, ITraceWriter trac
         {
             _innerBinding = innerBinding;
             _traceWriter = traceWriter;
+
+            // Properties that cannot be delegated to the inner must be replicated.
+            // They must also avoid an ArgumentNullException for null values.
+            if (_innerBinding.ParameterBindings != null)
+            {
+                ParameterBindings = _innerBinding.ParameterBindings;
+            }
+
+            if (_innerBinding.ActionDescriptor != null)
+            {
+                ActionDescriptor = _innerBinding.ActionDescriptor;
+            }
         }
 
         public override Task ExecuteBindingAsync(Controllers.HttpActionContext actionContext, CancellationToken cancellationToken)
diff --git a/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs b/test/System.Web.Http.Test/Tracing/Tracers/ActionValueBinderTracerTest.cs
@@ -11,6 +11,35 @@ namespace System.Web.Http.Tracing.Tracers
 {
     public class ActionValueBinderTracerTest
     {
+        [Fact]
+        public void GetBinding_Returns_HttpActionBindingTracer()
+        {
+            // Arrange
+            Mock<HttpActionDescriptor> mockActionDescriptor = new Mock<HttpActionDescriptor>() { CallBase = true };
+            mockActionDescriptor.Setup(a => a.ActionName).Returns("test");
+            mockActionDescriptor.Setup(a => a.GetParameters()).Returns(new Collection<HttpParameterDescriptor>(new HttpParameterDescriptor[0]));
+
+            Mock<HttpParameterDescriptor> mockParameterDescriptor = new Mock<HttpParameterDescriptor>() { CallBase = true };
+            Mock<HttpParameterBinding> mockParameterBinding = new Mock<HttpParameterBinding>(mockParameterDescriptor.Object) { CallBase = true };
+            HttpActionBinding actionBinding = new HttpActionBinding(mockActionDescriptor.Object, new HttpParameterBinding[] { mockParameterBinding.Object });
+
+            HttpControllerDescriptor controllerDescriptor = new HttpControllerDescriptor(new HttpConfiguration(), "controller", typeof(ApiController));
+
+            HttpControllerContext controllerContext = ContextUtil.CreateControllerContext(request: new HttpRequestMessage());
+            controllerContext.ControllerDescriptor = controllerDescriptor;
+
+            Mock<IActionValueBinder> mockBinder = new Mock<IActionValueBinder>() { CallBase = true };
+            mockBinder.Setup(b => b.GetBinding(It.IsAny<HttpActionDescriptor>())).Returns(actionBinding);
+            ActionValueBinderTracer tracer = new ActionValueBinderTracer(mockBinder.Object, new TestTraceWriter());
+
+            // Act
+            HttpActionBinding actualBinding = ((IActionValueBinder)tracer).GetBinding(mockActionDescriptor.Object);
+
+            // Assert
+            Assert.IsType<HttpActionBindingTracer>(actualBinding);
+            Assert.Same(mockActionDescriptor.Object, actualBinding.ActionDescriptor);
+        }
+
         [Fact]
         public void GetBinding_Invokes_Inner_And_Returns_ActionBinder_With_Tracing_HttpParameterBinding()
         {

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,12 @@ HttpActionBinding IActionValueBinder.GetBinding(HttpActionDescriptor actionDescr`
`34`	`34`	`: (HttpParameterBinding)new HttpParameterBindingTracer(parameterBinding, _traceWriter);`
`35`	`35`	`}`
`36`	`36`
`37`		`- HttpActionBinding newActionBinding = new HttpActionBinding(actionDescriptor, newParameterBindings);`
`38`		`- return newActionBinding;`
	`37`	`+ // Replace the inner HttpActionBinding's parameter bindings with our tracing versions.`
	`38`	`+ // This allows each individual parameter binding to trace.`
	`39`	`+ actionBinding.ParameterBindings = newParameterBindings;`
	`40`	`+`
	`41`	`+ // Then create an HttpActionBindingTracer to wrap the actual HttpActionBinding`
	`42`	`+ return new HttpActionBindingTracer(actionBinding, _traceWriter);`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`	`}`