Improve names

Author: bording

…s.RabbitMQ/RabbitMQBrokerQueueDetails.cs …ansports.RabbitMQ/RabbitMQBrokerQueue.cssrc/ServiceControl.Transports.RabbitMQ/RabbitMQBrokerQueueDetails.cs renamed to src/ServiceControl.Transports.RabbitMQ/RabbitMQBrokerQueue.cs src/ServiceControl.Transports.RabbitMQ/RabbitMQBrokerQueueDetails.cs renamed to src/ServiceControl.Transports.RabbitMQ/RabbitMQBrokerQueue.cs

@@ -5,7 +5,7 @@ namespace ServiceControl.Transports.RabbitMQ;
 using NServiceBus.Transport.RabbitMQ.ManagementApi;
 using ServiceControl.Transports.BrokerThroughput;
 
-class RabbitMQBrokerQueueDetails(Queue queue) : IBrokerQueue
+class RabbitMQBrokerQueue(Queue queue) : IBrokerQueue
 {
     public string QueueName { get; } = queue.Name;
 
@@ -19,7 +19,7 @@ class RabbitMQBrokerQueueDetails(Queue queue) : IBrokerQueue
 
     long Baseline { get; set; } = queue.MessageStats?.Ack ?? 0;
 
-    public long CalculateThroughputFrom(RabbitMQBrokerQueueDetails newReading)
+    public long CalculateThroughputFrom(RabbitMQBrokerQueue newReading)
     {
         var newlyAckedMessages = 0L;
 

src/ServiceControl.Transports.RabbitMQ/RabbitMQQuery.cs

@@ -42,15 +42,15 @@ public RabbitMQQuery(ILogger<RabbitMQQuery> logger, TimeProvider timeProvider, I
 
     public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBrokerQueue brokerQueue, DateOnly startDate, [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        var queue = (RabbitMQBrokerQueueDetails)brokerQueue;
+        var queue = (RabbitMQBrokerQueue)brokerQueue;
         var response = await pipeline.ExecuteAsync(async token => await managementClient.Value.GetQueue(queue.QueueName, token), cancellationToken);
 
         if (response.Value is null)
         {
             throw new InvalidOperationException($"Could not access RabbitMQ Management API. ({response.StatusCode}: {response.Reason})");
         }
 
-        var newReading = new RabbitMQBrokerQueueDetails(response.Value);
+        var newReading = new RabbitMQBrokerQueue(response.Value);
 
         _ = queue.CalculateThroughputFrom(newReading);
 
@@ -66,7 +66,7 @@ public override async IAsyncEnumerable<QueueThroughput> GetThroughputPerDay(IBro
                 throw new InvalidOperationException($"Could not access RabbitMQ Management API. ({response.StatusCode}: {response.Reason})");
             }
 
-            newReading = new RabbitMQBrokerQueueDetails(response.Value);
+            newReading = new RabbitMQBrokerQueue(response.Value);
             var newTotalThroughput = queue.CalculateThroughputFrom(newReading);
 
             yield return new QueueThroughput
@@ -82,7 +82,7 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
         var page = 1;
         bool morePages;
 
-        await GetRabbitDetails(cancellationToken);
+        await GetBrokerDetails(cancellationToken);
 
         do
         {
@@ -101,17 +101,17 @@ public override async IAsyncEnumerable<IBrokerQueue> GetQueueNames([EnumeratorCa
                         continue;
                     }
 
-                    var queueDetails = new RabbitMQBrokerQueueDetails(queue);
-                    await AddAdditionalQueueDetails(queueDetails, cancellationToken);
-                    yield return queueDetails;
+                    var brokerQueue = new RabbitMQBrokerQueue(queue);
+                    await AddEndpointIndicators(brokerQueue, cancellationToken);
+                    yield return brokerQueue;
                 }
             }
 
             page++;
         } while (morePages);
     }
 
-    async Task GetRabbitDetails(CancellationToken cancellationToken)
+    async Task GetBrokerDetails(CancellationToken cancellationToken)
     {
         var response = await pipeline.ExecuteAsync(async async => await managementClient.Value.GetOverview(cancellationToken), cancellationToken);
 
@@ -125,7 +125,7 @@ async Task GetRabbitDetails(CancellationToken cancellationToken)
         Data["RabbitMQVersion"] = response.Value?.BrokerVersion ?? "Unknown";
     }
 
-    async Task AddAdditionalQueueDetails(RabbitMQBrokerQueueDetails brokerQueue, CancellationToken cancellationToken)
+    async Task AddEndpointIndicators(RabbitMQBrokerQueue brokerQueue, CancellationToken cancellationToken)
     {
         try
         {