Fix ScaleHostEndToEndTest for ServiceBus (Azure#37020)

* Enable tests

* Disposing ScaleHost

* Try to ignore

* Disposing host

* Adding exception stack

* Fix exceptions logs

* Remove comment

* Remove stack from log message

Author: alrod

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/src/Listeners/ServiceBusMetricsProvider.cs

@@ -96,13 +96,13 @@ public async Task<long> GetMessageCountAsync()
             {
                 if (TimeToLogWarning())
                 {
-                    _logger.LogWarning($"Connection string does not have 'Manage Claim' for {entityName} '{_entityPath}'. Unable to determine active message count.", ex);
+                    _logger.LogWarning(ex, $"Connection string does not have 'Manage Claim' for {entityName} '{_entityPath}'. Unable to determine active message count.");
                 }
                 throw ex;
             }
             catch (Exception e)
             {
-                _logger.LogWarning($"Error querying for Service Bus {entityName} scale status: {e.Message}");
+                _logger.LogWarning(e, $"Error querying for Service Bus {entityName} scale");
             }
 
             long totalNewMessageCount = 0;

sdk/servicebus/Microsoft.Azure.WebJobs.Extensions.ServiceBus/tests/ScaleHostEndToEndTests.cs

@@ -31,7 +31,6 @@ public ScaleHostEndToEndTests() : base(isSession: false)
         }
 
         [Test]
-        [Ignore("Consistently failing in CI; awaiting investigation")]
         [TestCase(false)]
         [TestCase(true)]
         public async Task ScaleHostEndToEndTest(bool tbsEnabled)
@@ -68,9 +67,12 @@ public async Task ScaleHostEndToEndTest(bool tbsEnabled)
     }}
  ]}}";
 
-            IHost host = new HostBuilder().ConfigureServices(services => services.AddAzureClientsCore()).Build();
-            AzureComponentFactory defaultAzureComponentFactory = host.Services.GetService<AzureComponentFactory>();
-            TestComponentFactory factoryWrapper = new TestComponentFactory(defaultAzureComponentFactory, ServiceBusTestEnvironment.Instance.Credential);
+            TestComponentFactory factoryWrapper = null;
+            using (IHost host = new HostBuilder().ConfigureServices(services => services.AddAzureClientsCore()).Build())
+            {
+                AzureComponentFactory defaultAzureComponentFactory = host.Services.GetService<AzureComponentFactory>();
+                factoryWrapper = new TestComponentFactory(defaultAzureComponentFactory, ServiceBusTestEnvironment.Instance.Credential);
+            }
 
             string hostId = "test-host";
             var loggerProvider = new TestLoggerProvider();
@@ -125,60 +127,63 @@ public async Task ScaleHostEndToEndTest(bool tbsEnabled)
                 scaleOptions.ScaleMetricsSampleInterval = TimeSpan.FromSeconds(1);
             });
 
-            IHost scaleHost = hostBuilder.Build();
-            await scaleHost.StartAsync();
-
-            // add some messages to the queue
-            await WriteQueueMessage("test");
-            await WriteQueueMessage("test");
-            await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
-            await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
-            await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
-
-            await TestHelpers.Await(async () =>
+            using (IHost scaleHost = hostBuilder.Build())
             {
-                IScaleStatusProvider scaleManager = scaleHost.Services.GetService<IScaleStatusProvider>();
+                await scaleHost.StartAsync();
 
-                var scaleStatus = await scaleManager.GetScaleStatusAsync(new ScaleStatusContext());
+                // add some messages to the queue
+                await WriteQueueMessage("test");
+                await WriteQueueMessage("test");
+                await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
+                await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
+                await WriteQueueMessage("test", queueName: SecondQueueScope.QueueName);
 
-                bool scaledOut = false;
-                if (!tbsEnabled)
+                await TestHelpers.Await(async () =>
                 {
-                    scaledOut = scaleStatus.Vote == ScaleVote.ScaleOut && scaleStatus.TargetWorkerCount == null
-                     && scaleStatus.FunctionScaleStatuses[Function1Name].Vote == ScaleVote.ScaleOut
-                     && scaleStatus.FunctionScaleStatuses[Function2Name].Vote == ScaleVote.ScaleOut;
+                    IScaleStatusProvider scaleManager = scaleHost.Services.GetService<IScaleStatusProvider>();
 
-                    if (scaledOut)
+                    var scaleStatus = await scaleManager.GetScaleStatusAsync(new ScaleStatusContext());
+
+                    bool scaledOut = false;
+                    if (!tbsEnabled)
                     {
-                        var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
-                        Assert.Contains("2 scale monitors to sample", logMessages);
+                        scaledOut = scaleStatus.Vote == ScaleVote.ScaleOut && scaleStatus.TargetWorkerCount == null
+                         && scaleStatus.FunctionScaleStatuses[Function1Name].Vote == ScaleVote.ScaleOut
+                         && scaleStatus.FunctionScaleStatuses[Function2Name].Vote == ScaleVote.ScaleOut;
+
+                        if (scaledOut)
+                        {
+                            var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
+                            Assert.Contains("2 scale monitors to sample", logMessages);
+                        }
                     }
-                }
-                else
-                {
-                    scaledOut = scaleStatus.Vote == ScaleVote.ScaleOut && scaleStatus.TargetWorkerCount == 3
-                     && scaleStatus.FunctionTargetScalerResults[Function1Name].TargetWorkerCount == 2
-                     && scaleStatus.FunctionTargetScalerResults[Function2Name].TargetWorkerCount == 3;
-
-                    if (scaledOut)
+                    else
                     {
-                        var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
-                        Assert.Contains("2 target scalers to sample", logMessages);
+                        scaledOut = scaleStatus.Vote == ScaleVote.ScaleOut && scaleStatus.TargetWorkerCount == 3
+                         && scaleStatus.FunctionTargetScalerResults[Function1Name].TargetWorkerCount == 2
+                         && scaleStatus.FunctionTargetScalerResults[Function2Name].TargetWorkerCount == 3;
+
+                        if (scaledOut)
+                        {
+                            var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
+                            Assert.Contains("2 target scalers to sample", logMessages);
+                        }
                     }
-                }
 
-                if (scaledOut)
-                {
-                    var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
-                    Assert.IsNotEmpty(logMessages.Where(x => x.StartsWith("Runtime scale monitoring is enabled.")));
-                    if (!tbsEnabled)
+                    if (scaledOut)
                     {
-                        Assert.Contains("Scaling out based on votes", logMessages);
+                        var logMessages = loggerProvider.GetAllLogMessages().Select(p => p.FormattedMessage).ToArray();
+                        Assert.IsNotEmpty(logMessages.Where(x => x.StartsWith("Runtime scale monitoring is enabled.")));
+                        if (!tbsEnabled)
+                        {
+                            Assert.Contains("Scaling out based on votes", logMessages);
+                        }
                     }
-                }
 
-                return scaledOut;
-            }, pollingInterval: 2000, timeout: 180000, throwWhenDebugging: true);
+                    return scaledOut;
+                }, pollingInterval: 2000, timeout: 180000, throwWhenDebugging: true);
+                await scaleHost.StopAsync();
+            }
         }
     }
 }