Comment out Vhost property for now

Author: Travis Nickels

src/ServiceControl.Transports.RabbitMQ/RabbitMQBrokerQueueDetails.cs

@@ -9,8 +9,8 @@ class RabbitMQBrokerQueueDetails(Queue queue) : IBrokerQueue
 {
     public string QueueName { get; } = queue.Name;
     public string SanitizedName => QueueName;
-    public string Scope => VHost;
-    public string VHost { get; } = queue.Vhost;
+    public string? Scope => null;
+    //public string VHost { get; } = queue.Vhost;
     public List<string> EndpointIndicators { get; } = [];
     long? AckedMessages { get; set; } = queue.MessageStats?.Ack;
     long Baseline { get; set; } = queue.MessageStats?.Ack ?? 0;

src/ServiceControl.Transports.RabbitMQ/RabbitMQQuery.cs

@@ -10,7 +10,6 @@ namespace ServiceControl.Transports.RabbitMQ;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Web;
 using Microsoft.Extensions.Logging;
 using NServiceBus;
 using Polly;
@@ -72,9 +71,9 @@ public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBro
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         var queue = (RabbitMQBrokerQueueDetails)brokerQueue;
-        var url = $"/api/queues/{HttpUtility.UrlEncode(queue.VHost)}/{HttpUtility.UrlEncode(queue.QueueName)}";
+        //var url = $"/api/queues/{HttpUtility.UrlEncode(queue.VHost)}/{HttpUtility.UrlEncode(queue.QueueName)}";
 
-        logger.LogDebug($"Querying {url}");
+        //logger.LogDebug($"Querying {url}");
 
         var response = await pipeline.ExecuteAsync(async token => await rabbitMQTransport.ManagementClient.GetQueue(queue.QueueName, cancellationToken), cancellationToken);
 
@@ -91,7 +90,7 @@ public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBro
         for (var i = 0; i < 24 * 4; i++)
         {
             await Task.Delay(TimeSpan.FromMinutes(15), timeProvider, cancellationToken);
-            logger.LogDebug($"Querying {url}");
+            //logger.LogDebug($"Querying {url}");
             response = await pipeline.ExecuteAsync(async token => await rabbitMQTransport.ManagementClient.GetQueue(queue.QueueName, cancellationToken), cancellationToken);
 
             if (response.Value is not null)
@@ -144,7 +143,7 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
     {
         var page = 1;
         bool morePages;
-        var vHosts = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase);
+        //var vHosts = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase);
 
         await GetRabbitDetails(false, cancellationToken);
 
@@ -162,7 +161,7 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
                     {
                         continue;
                     }
-                    vHosts.Add(rabbitMQQueueDetails.VHost);
+                    //vHosts.Add(rabbitMQQueueDetails.VHost);
                     await AddAdditionalQueueDetails(rabbitMQQueueDetails, cancellationToken);
                     yield return rabbitMQQueueDetails;
                 }
@@ -171,7 +170,7 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
             page++;
         } while (morePages);
 
-        ScopeType = vHosts.Count > 1 ? "VirtualHost" : null;
+        //ScopeType = vHosts.Count > 1 ? "VirtualHost" : null;
     }
 
     async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, CancellationToken cancellationToken)
@@ -182,7 +181,7 @@ async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, Can
 
             // Check if conventional binding is found
             if (response.Value.Any(binding => binding?.Source == brokerQueue.QueueName
-                && binding?.Vhost == brokerQueue.VHost
+                //&& binding?.Vhost == brokerQueue.VHost
                 && binding?.Destination == brokerQueue.QueueName
                 && binding?.DestinationType == "queue"
                 && binding?.RoutingKey == string.Empty
@@ -202,7 +201,7 @@ async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, Can
 
             // Check if delayed binding is found
             if (response.Value.Any(binding => binding?.Source is "nsb.v2.delay-delivery" or "nsb.delay-delivery"
-                    && binding?.Vhost == brokerQueue.VHost
+                    //&& binding?.Vhost == brokerQueue.VHost
                     && binding?.Destination == brokerQueue.QueueName
                     && binding?.DestinationType == "exchange"
                     && binding?.RoutingKey == $"#.{brokerQueue.QueueName}"))