Let endpoint details include only queue name

Author: johnsimons

src/ServiceControl.Persistence.RavenDB/ConnectedApplicationsDataStore.cs

@@ -4,12 +4,9 @@
     using System.Threading.Tasks;
     using Raven.Client.Documents;
     using Raven.Client.Documents.Session;
-    using ServiceControl.Persistence.Infrastructure;
 
     class ConnectedApplicationsDataStore(IRavenSessionProvider sessionProvider) : IConnectedApplicationsDataStore
     {
-        public static string MakeDocumentId(string name) => $"{ConnectedApplication.CollectionName}/{DeterministicGuid.MakeId(name)}";
-
         public async Task<ConnectedApplication[]> GetAllConnectedApplications()
         {
             using IAsyncDocumentSession session = await sessionProvider.OpenSession();
@@ -20,7 +17,7 @@ public async Task<ConnectedApplication[]> GetAllConnectedApplications()
 
         public async Task UpdateConnectedApplication(ConnectedApplication connectedApplication, CancellationToken cancellationToken)
         {
-            string docId = MakeDocumentId(connectedApplication.Name);
+            string docId = ConnectedApplication.MakeDocumentId(connectedApplication.Name);
 
             using IAsyncDocumentSession session = await sessionProvider.OpenSession(cancellationToken: cancellationToken);
 

src/ServiceControl.Persistence.RavenDB/EndpointDetailsParser.cs

@@ -80,7 +80,7 @@ public static EndpointDetails ReceivingEndpoint(IReadOnlyDictionary<string, stri
                 }
 
                 // If we've been now able to get the endpoint details, return the new info.
-                if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))
+                if (!string.IsNullOrEmpty(endpoint.Name))
                 {
                     return endpoint;
                 }

src/ServiceControl.Persistence.RavenDB/RavenMonitoringDataStore.cs

@@ -96,7 +96,7 @@ public async Task WarmupMonitoringFromPersistence(IEndpointInstanceMonitoring en
                 endpointInstanceMonitoring.DetectEndpointFromPersistentStore(
                     endpoint.EndpointDetails,
                     endpoint.Monitored,
-                    connectedApplications.SingleOrDefault(ca => ConnectedApplicationsDataStore.MakeDocumentId(ca.Name) == endpoint.EndpointDetails.ConnectedApplicationId)?.SupportsHeartbeats ?? true
+                    connectedApplications.SingleOrDefault(ca => ConnectedApplication.MakeDocumentId(ca.Name) == endpoint.EndpointDetails.ConnectedApplicationId)?.SupportsHeartbeats ?? true
                 );
             }
         }

src/ServiceControl.Persistence/ConnectedApplication.cs

@@ -1,9 +1,13 @@
 namespace ServiceControl.Persistence;
 
+using Infrastructure;
+
 public class ConnectedApplication
 {
     public string Name { get; set; }
     public bool SupportsHeartbeats { get; set; }
 
     public const string CollectionName = "ConnectedApplications";
+
+    public static string MakeDocumentId(string name) => $"{CollectionName}/{DeterministicGuid.MakeId(name)}";
 }

src/ServiceControl/Operations/EndpointDetailsParser.cs

@@ -41,7 +41,8 @@ public static EndpointDetails ReceivingEndpoint(IReadOnlyDictionary<string, stri
             var endpoint = new EndpointDetails();
 
             DictionaryExtensions.CheckIfKeyExists(Headers.HostId, headers, s => endpoint.HostId = Guid.Parse(s));
-            DictionaryExtensions.CheckIfKeyExists("NServiceBus.ConnectedApplication", headers, s => endpoint.ConnectedApplicationId = $"{ConnectedApplication.CollectionName}/{DeterministicGuid.MakeId(s)}");
+            DictionaryExtensions.CheckIfKeyExists("NServiceBus.ConnectedApplication", headers,
+                s => endpoint.ConnectedApplicationId = ConnectedApplication.MakeDocumentId(s));
 
             if (headers.TryGetValue(Headers.HostDisplayName, out var hostDisplayNameHeader))
             {
@@ -79,7 +80,7 @@ public static EndpointDetails ReceivingEndpoint(IReadOnlyDictionary<string, stri
                 }
 
                 // If we've been now able to get the endpoint details, return the new info.
-                if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))
+                if (!string.IsNullOrEmpty(endpoint.Name))
                 {
                     return endpoint;
                 }