Include FunctionActivityStatus in DrainModeStatus (#8383) (#8402)

Author: pragnagopa

src/WebJobs.Script.WebHost/Controllers/HostController.cs

@@ -153,7 +153,9 @@ public IActionResult DrainStatus([FromServices] IScriptHostManager scriptHostMan
 
                 DrainModeStatus status = new DrainModeStatus()
                 {
-                    State = state
+                    State = state,
+                    OutstandingInvocations = functionActivityStatus.OutstandingInvocations,
+                    OutstandingRetries = functionActivityStatus.OutstandingRetries
                 };
 
                 string message = $"Drain Status: {JsonConvert.SerializeObject(state, Formatting.Indented)}, Activity Status: {JsonConvert.SerializeObject(functionActivityStatus, Formatting.Indented)}";

src/WebJobs.Script.WebHost/Models/DrainModeStatus.cs

@@ -11,5 +11,11 @@ public class DrainModeStatus
         [JsonProperty("state")]
         [JsonConverter(typeof(StringEnumConverter))]
         public DrainModeState State { get; set; }
+
+        [JsonProperty("outstandingInvocations")]
+        public int OutstandingInvocations { get; set; }
+
+        [JsonProperty("outstandingRetries")]
+        public int OutstandingRetries { get; set; }
     }
 }

test/WebJobs.Script.Tests/Controllers/Admin/HostControllerTests.cs

@@ -242,6 +242,7 @@ public async Task Ping_ReturnsOk()
         [InlineData(2, 0, DrainModeState.InProgress)]
         [InlineData(0, 10, DrainModeState.InProgress)]
         [InlineData(5, 1, DrainModeState.InProgress)]
+        [InlineData(20, 30, DrainModeState.Disabled)]
         public void GetDrainStatus_HostRunning_ReturnsExpected(int outstandingRetries, int outstandingInvocations, DrainModeState expectedState)
         {
             var scriptHostManagerMock = new Mock<IScriptHostManager>(MockBehavior.Strict);
@@ -256,9 +257,11 @@ public void GetDrainStatus_HostRunning_ReturnsExpected(int outstandingRetries, i
             serviceProviderMock.Setup(x => x.GetService(typeof(IFunctionActivityStatusProvider))).Returns(functionActivityStatusProvider.Object);
             serviceProviderMock.Setup(x => x.GetService(typeof(IDrainModeManager))).Returns(drainModeManager.Object);
             drainModeManager.Setup(x => x.IsDrainModeEnabled).Returns(expectedState != DrainModeState.Disabled);
-
             var result = (OkObjectResult)_hostController.DrainStatus(scriptHostManagerMock.Object);
-            Assert.Equal(expectedState, (result.Value as DrainModeStatus).State);
+            var resultStatus = result.Value as DrainModeStatus;
+            Assert.Equal(expectedState, resultStatus.State);
+            Assert.Equal(outstandingRetries, resultStatus.OutstandingRetries);
+            Assert.Equal(outstandingInvocations, resultStatus.OutstandingInvocations);
         }
 
         [Fact]