Remove connectapplications

johnsimons · johnsimons · commit 1387c1b32802 · 2025-01-17T16:45:05.000+10:00
We replacing it with a specific implementation
diff --git a/src/ServiceControl.Persistence.RavenDB/ConnectedApplicationsDataStore.cs b/src/ServiceControl.Persistence.RavenDB/ConnectedApplicationsDataStore.cs
diff --git a/src/ServiceControl.Persistence.RavenDB/EndpointDetailsParser.cs b/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))
+                if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))
                 {
                     return endpoint;
                 }
diff --git a/src/ServiceControl.Persistence.RavenDB/RavenMonitoringDataStore.cs b/src/ServiceControl.Persistence.RavenDB/RavenMonitoringDataStore.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using System.Threading.Tasks;
     using Raven.Client.Documents;
     using ServiceControl.Operations;
@@ -87,17 +86,12 @@ public async Task WarmupMonitoringFromPersistence(IEndpointInstanceMonitoring en
         {
             using var session = await sessionProvider.OpenSession();
             await using var endpointsEnumerator = await session.Advanced.StreamAsync(session.Query<KnownEndpoint, KnownEndpointIndex>());
-            var connectedApplications = await session.Advanced.LoadStartingWithAsync<ConnectedApplication>(ConnectedApplication.CollectionName, pageSize: 1024);
 
             while (await endpointsEnumerator.MoveNextAsync())
             {
                 var endpoint = endpointsEnumerator.Current.Document;
 
-                endpointInstanceMonitoring.DetectEndpointFromPersistentStore(
-                    endpoint.EndpointDetails,
-                    endpoint.Monitored,
-                    connectedApplications.SingleOrDefault(ca => ConnectedApplication.MakeDocumentId(ca.Name) == endpoint.EndpointDetails.ConnectedApplicationId)?.SupportsHeartbeats ?? true
-                );
+                endpointInstanceMonitoring.DetectEndpointFromPersistentStore(endpoint.EndpointDetails, endpoint.Monitored);
             }
         }
 
diff --git a/src/ServiceControl.Persistence.RavenDB/RavenPersistence.cs b/src/ServiceControl.Persistence.RavenDB/RavenPersistence.cs
@@ -66,7 +66,6 @@ public void AddPersistence(IServiceCollection services)
         services.AddSingleton<IRetryHistoryDataStore, RetryHistoryDataStore>();
         services.AddSingleton<IEndpointSettingsStore, EndpointSettingsStore>();
         services.AddSingleton<ITrialLicenseDataProvider, TrialLicenseDataProvider>();
-        services.AddSingleton<IConnectedApplicationsDataStore, ConnectedApplicationsDataStore>();
     }
 
     public void AddInstaller(IServiceCollection services)
diff --git a/src/ServiceControl.Persistence.Tests.RavenDB/ConnectedApplications/ConnectedApplicationsTests.cs b/src/ServiceControl.Persistence.Tests.RavenDB/ConnectedApplications/ConnectedApplicationsTests.cs
diff --git a/src/ServiceControl.Persistence/ConnectedApplication.cs b/src/ServiceControl.Persistence/ConnectedApplication.cs
diff --git a/src/ServiceControl.Persistence/EndpointDetails.cs b/src/ServiceControl.Persistence/EndpointDetails.cs
@@ -11,8 +11,6 @@ public class EndpointDetails
 
         public string Host { get; set; }
 
-        public string ConnectedApplicationId { get; set; }
-
         public Guid GetDeterministicId() => DeterministicGuid.MakeId(Name, HostId.ToString());
     }
 }
diff --git a/src/ServiceControl.Persistence/EndpointInstanceId.cs b/src/ServiceControl.Persistence/EndpointInstanceId.cs
@@ -5,13 +5,12 @@ namespace ServiceControl.Persistence
 
     public class EndpointInstanceId : IEquatable<EndpointInstanceId>
     {
-        public EndpointInstanceId(string logicalName, string hostName, Guid hostGuid, bool supportsHeartbeats)
+        public EndpointInstanceId(string logicalName, string hostName, Guid hostGuid)
         {
             LogicalName = logicalName;
             HostName = hostName;
             HostGuid = hostGuid;
             UniqueId = DeterministicGuid.MakeId(LogicalName, HostGuid.ToString());
-            SupportsHeartbeats = supportsHeartbeats;
         }
 
         public Guid UniqueId { get; }
diff --git a/src/ServiceControl.Persistence/EndpointsView.cs b/src/ServiceControl.Persistence/EndpointsView.cs
@@ -10,7 +10,6 @@ public class EndpointsView
         public bool Monitored { get; set; }
         public bool MonitorHeartbeat { get; set; }
         public HeartbeatInformation HeartbeatInformation { get; set; }
-        public bool SupportsHeartbeats { get; set; }
         public bool IsSendingHeartbeats { get; set; }
     }
 }
diff --git a/src/ServiceControl.Persistence/IConnectedApplicationsDataStore.cs b/src/ServiceControl.Persistence/IConnectedApplicationsDataStore.cs
diff --git a/src/ServiceControl.Persistence/IEndpointInstanceMonitoring.cs b/src/ServiceControl.Persistence/IEndpointInstanceMonitoring.cs
@@ -9,7 +9,7 @@ public interface IEndpointInstanceMonitoring
     {
         Task CheckEndpoints(DateTime threshold);
         Task DetectEndpointFromHeartbeatStartup(EndpointDetails newEndpointDetails, DateTime startedAt);
-        void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored, bool supportsHeartbeats);
+        void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored);
         Task DisableMonitoring(Guid id);
         Task EnableMonitoring(Guid id);
         Task EndpointDetected(EndpointDetails newEndpointDetails);
diff --git a/src/ServiceControl.UnitTests/API/APIApprovals.cs b/src/ServiceControl.UnitTests/API/APIApprovals.cs
@@ -33,7 +33,6 @@ public async Task RootPathValue()
             var controller = new RootController(new ConfigurationApi(
                     new ActiveLicense(null) { IsValid = true },
                     new Settings(),
-                    null,
                     null
                 )
             )
diff --git a/src/ServiceControl.UnitTests/Monitoring/EndpointInstanceMonitoringTests.cs b/src/ServiceControl.UnitTests/Monitoring/EndpointInstanceMonitoringTests.cs
@@ -14,7 +14,7 @@ public async Task When_endpoint_removed_should_stay_removed()
         {
             var monitor = new EndpointInstanceMonitoring(new FakeDomainEvents());
 
-            var monitoredEndpoint = new EndpointInstanceId("MonitoredEndpoint", "HostName", Guid.NewGuid(), true);
+            var monitoredEndpoint = new EndpointInstanceId("MonitoredEndpoint", "HostName", Guid.NewGuid());
             var lastHeartbeat = DateTime.UtcNow;
 
             monitor.RecordHeartbeat(monitoredEndpoint, lastHeartbeat);
diff --git a/src/ServiceControl.UnitTests/Monitoring/HeartbeatEndpointSettingsSyncHostedServiceTests.cs b/src/ServiceControl.UnitTests/Monitoring/HeartbeatEndpointSettingsSyncHostedServiceTests.cs
@@ -211,7 +211,7 @@ class MockEndpointInstanceMonitoring(EndpointsView[] endpointsViews) : IEndpoint
         public Task DetectEndpointFromHeartbeatStartup(EndpointDetails newEndpointDetails, DateTime startedAt) =>
             throw new NotImplementedException();
 
-        public void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored, bool supportsHeartbeats) =>
+        public void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored) =>
             throw new NotImplementedException();
 
         public Task DisableMonitoring(Guid id) => throw new NotImplementedException();
diff --git a/src/ServiceControl/Infrastructure/Api/ConfigurationApi.cs b/src/ServiceControl/Infrastructure/Api/ConfigurationApi.cs
@@ -12,11 +12,9 @@
 using ServiceBus.Management.Infrastructure.Settings;
 using ServiceControl.Api;
 using ServiceControl.Api.Contracts;
-using ServiceControl.Persistence;
 
 class ConfigurationApi(ActiveLicense license,
     Settings settings,
-    IConnectedApplicationsDataStore connectedApplicationsDataStore,
     IHttpClientFactory httpClientFactory) : IConfigurationApi
 {
     public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToken)
@@ -51,7 +49,7 @@ public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToke
     }
 
 
-    public async Task<object> GetConfig(CancellationToken cancellationToken)
+    public Task<object> GetConfig(CancellationToken cancellationToken)
     {
         object content = new
         {
@@ -85,10 +83,13 @@ public async Task<object> GetConfig(CancellationToken cancellationToken)
             {
                 settings.HeartbeatGracePeriod
             },
-            ConnectedApplications = await connectedApplicationsDataStore.GetAllConnectedApplications(),
+            MassTransitConnector = new
+            {
+                foobar = "barfoo"
+            }
         };
 
-        return content;
+        return Task.FromResult(content);
     }
 
     public async Task<RemoteConfiguration[]> GetRemoteConfigs(CancellationToken cancellationToken = default)
diff --git a/src/ServiceControl/Licensing/LicenseController.cs b/src/ServiceControl/Licensing/LicenseController.cs
@@ -1,16 +1,14 @@
 ﻿namespace ServiceControl.Licensing
 {
-    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
     using Particular.ServiceControl.Licensing;
-    using Persistence;
     using ServiceBus.Management.Infrastructure.Settings;
 
     [ApiController]
     [Route("api")]
-    public class LicenseController(ActiveLicense activeLicense, Settings settings, IConnectedApplicationsDataStore connectedApplicationsStore) : ControllerBase
+    public class LicenseController(ActiveLicense activeLicense, Settings settings) : ControllerBase
     {
         [HttpGet]
         [Route("license")]
@@ -32,21 +30,12 @@ public async Task<ActionResult<LicenseInfo>> License(bool refresh, string client
                 LicenseType = activeLicense.Details.LicenseType ?? string.Empty,
                 InstanceName = settings.InstanceName ?? string.Empty,
                 LicenseStatus = activeLicense.Details.Status,
-                LicenseExtensionUrl = $"https://particular.net/extend-your-trial?p={clientName}{await BuildConnectedApplicationsListPart()}"
+                LicenseExtensionUrl = $"https://particular.net/extend-your-trial?p={clientName}"
             };
 
             return licenseInfo;
         }
 
-        async Task<string> BuildConnectedApplicationsListPart()
-        {
-            var connectedApplications = await connectedApplicationsStore.GetAllConnectedApplications();
-
-            return connectedApplications != null && connectedApplications.Length > 0
-                ? $"&ca={string.Join(',', connectedApplications.Select(ca => ca.Name))}"
-                : string.Empty;
-        }
-
         public class LicenseInfo
         {
             public bool TrialLicense { get; set; }
diff --git a/src/ServiceControl/Monitoring/EndpointDetailsExtensions.cs b/src/ServiceControl/Monitoring/EndpointDetailsExtensions.cs
@@ -7,7 +7,7 @@ public static class EndpointDetailsExtensions
     {
         public static EndpointInstanceId ToInstanceId(this EndpointDetails endpointDetails)
         {
-            return new EndpointInstanceId(endpointDetails.Name, endpointDetails.Host, endpointDetails.HostId, true);
+            return new EndpointInstanceId(endpointDetails.Name, endpointDetails.Host, endpointDetails.HostId);
         }
     }
 }
diff --git a/src/ServiceControl/Monitoring/EndpointInstanceMonitor.cs b/src/ServiceControl/Monitoring/EndpointInstanceMonitor.cs
@@ -5,7 +5,6 @@ namespace ServiceControl.Monitoring
     using Contracts.HeartbeatMonitoring;
     using EndpointControl.Contracts;
     using Infrastructure.DomainEvents;
-    using NLog.Fluent;
     using NServiceBus.Logging;
     using ServiceControl.Operations;
     using ServiceControl.Persistence;
@@ -116,7 +115,6 @@ public EndpointsView GetView()
                 HostDisplayName = Id.HostName,
                 Monitored = Monitored,
                 MonitorHeartbeat = Monitored,
-                SupportsHeartbeats = Id.SupportsHeartbeats,
 
                 HeartbeatInformation = lastSeen.HasValue ? new HeartbeatInformation
                 {
diff --git a/src/ServiceControl/Monitoring/EndpointInstanceMonitoring.cs b/src/ServiceControl/Monitoring/EndpointInstanceMonitoring.cs
@@ -73,9 +73,9 @@ await domainEvents.Raise(new EndpointStarted
             });
         }
 
-        public void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored, bool supportsHeartbeats)
+        public void DetectEndpointFromPersistentStore(EndpointDetails endpointDetails, bool monitored)
         {
-            var endpointInstanceId = new EndpointInstanceId(endpointDetails.Name, endpointDetails.Host, endpointDetails.HostId, supportsHeartbeats);
+            var endpointInstanceId = new EndpointInstanceId(endpointDetails.Name, endpointDetails.Host, endpointDetails.HostId);
             endpoints.GetOrAdd(endpointInstanceId.UniqueId, id => new EndpointInstanceMonitor(endpointInstanceId, monitored, domainEvents));
         }
 
diff --git a/src/ServiceControl/Monitoring/HeartbeatMonitoring/InternalMessages/ConnectedApplication.cs b/src/ServiceControl/Monitoring/HeartbeatMonitoring/InternalMessages/ConnectedApplication.cs
diff --git a/src/ServiceControl/Monitoring/Transport/ConnectedApplicationHandler.cs b/src/ServiceControl/Monitoring/Transport/ConnectedApplicationHandler.cs
diff --git a/src/ServiceControl/Monitoring/Transport/HeartbeatHandler.cs b/src/ServiceControl/Monitoring/Transport/HeartbeatHandler.cs
@@ -14,7 +14,7 @@ public HeartbeatHandler(IEndpointInstanceMonitoring monitor)
 
         public Task Handle(EndpointHeartbeat message, IMessageHandlerContext context)
         {
-            var endpointInstanceId = new EndpointInstanceId(message.EndpointName, message.Host, message.HostId, true);
+            var endpointInstanceId = new EndpointInstanceId(message.EndpointName, message.Host, message.HostId);
 
             monitor.RecordHeartbeat(endpointInstanceId, message.ExecutedAt);
 
diff --git a/src/ServiceControl/Operations/EndpointDetailsParser.cs b/src/ServiceControl/Operations/EndpointDetailsParser.cs
@@ -5,7 +5,6 @@ namespace ServiceControl.Contracts.Operations
     using Infrastructure;
     using NServiceBus;
     using ServiceControl.Operations;
-    using ServiceControl.Persistence;
 
     class EndpointDetailsParser
     {
@@ -40,9 +39,10 @@ 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.MakeDocumentId(s));
+            if (headers.TryGetValue(Headers.HostId, out var hostIdHeader))
+            {
+                endpoint.HostId = Guid.Parse(hostIdHeader);
+            }
 
             if (headers.TryGetValue(Headers.HostDisplayName, out var hostDisplayNameHeader))
             {
@@ -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))
+                if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))
                 {
                     return endpoint;
                 }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static EndpointDetails ReceivingEndpoint(IReadOnlyDictionary<string, stri`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// If we've been now able to get the endpoint details, return the new info.`
`83`		`- if (!string.IsNullOrEmpty(endpoint.Name))`
	`83`	`+ if (!string.IsNullOrEmpty(endpoint.Name) && !string.IsNullOrEmpty(endpoint.Host))`
`84`	`84`	`{`
`85`	`85`	`return endpoint;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`		`- using System.Linq;`
`6`	`5`	`using System.Threading.Tasks;`
`7`	`6`	`using Raven.Client.Documents;`
`8`	`7`	`using ServiceControl.Operations;`
`@@ -87,17 +86,12 @@ public async Task WarmupMonitoringFromPersistence(IEndpointInstanceMonitoring en`
`87`	`86`	`{`
`88`	`87`	`using var session = await sessionProvider.OpenSession();`
`89`	`88`	`await using var endpointsEnumerator = await session.Advanced.StreamAsync(session.Query<KnownEndpoint, KnownEndpointIndex>());`
`90`		`- var connectedApplications = await session.Advanced.LoadStartingWithAsync<ConnectedApplication>(ConnectedApplication.CollectionName, pageSize: 1024);`
`91`	`89`
`92`	`90`	`while (await endpointsEnumerator.MoveNextAsync())`
`93`	`91`	`{`
`94`	`92`	`var endpoint = endpointsEnumerator.Current.Document;`
`95`	`93`
`96`		`- endpointInstanceMonitoring.DetectEndpointFromPersistentStore(`
`97`		`- endpoint.EndpointDetails,`
`98`		`- endpoint.Monitored,`
`99`		`- connectedApplications.SingleOrDefault(ca => ConnectedApplication.MakeDocumentId(ca.Name) == endpoint.EndpointDetails.ConnectedApplicationId)?.SupportsHeartbeats ?? true`
`100`		`- );`
	`94`	`+ endpointInstanceMonitoring.DetectEndpointFromPersistentStore(endpoint.EndpointDetails, endpoint.Monitored);`
`101`	`95`	`}`
`102`	`96`	`}`
`103`	`97`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ public void AddPersistence(IServiceCollection services)`
`66`	`66`	`services.AddSingleton<IRetryHistoryDataStore, RetryHistoryDataStore>();`
`67`	`67`	`services.AddSingleton<IEndpointSettingsStore, EndpointSettingsStore>();`
`68`	`68`	`services.AddSingleton<ITrialLicenseDataProvider, TrialLicenseDataProvider>();`
`69`		`- services.AddSingleton<IConnectedApplicationsDataStore, ConnectedApplicationsDataStore>();`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public void AddInstaller(IServiceCollection services)`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ public class EndpointDetails`
`11`	`11`
`12`	`12`	`public string Host { get; set; }`
`13`	`13`
`14`		`- public string ConnectedApplicationId { get; set; }`
`15`		`-`
`16`	`14`	`public Guid GetDeterministicId() => DeterministicGuid.MakeId(Name, HostId.ToString());`
`17`	`15`	`}`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,12 @@ namespace ServiceControl.Persistence`
`5`	`5`
`6`	`6`	`public class EndpointInstanceId : IEquatable<EndpointInstanceId>`
`7`	`7`	`{`
`8`		`- public EndpointInstanceId(string logicalName, string hostName, Guid hostGuid, bool supportsHeartbeats)`
	`8`	`+ public EndpointInstanceId(string logicalName, string hostName, Guid hostGuid)`
`9`	`9`	`{`
`10`	`10`	`LogicalName = logicalName;`
`11`	`11`	`HostName = hostName;`
`12`	`12`	`HostGuid = hostGuid;`
`13`	`13`	`UniqueId = DeterministicGuid.MakeId(LogicalName, HostGuid.ToString());`
`14`		`- SupportsHeartbeats = supportsHeartbeats;`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`public Guid UniqueId { get; }`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public class EndpointsView`
`10`	`10`	`public bool Monitored { get; set; }`
`11`	`11`	`public bool MonitorHeartbeat { get; set; }`
`12`	`12`	`public HeartbeatInformation HeartbeatInformation { get; set; }`
`13`		`- public bool SupportsHeartbeats { get; set; }`
`14`	`13`	`public bool IsSendingHeartbeats { get; set; }`
`15`	`14`	`}`
`16`	`15`	`}`