Merge pull request #4720 from Particular/connector_heartbeat

johnsimons · web-flow · commit 3d91b73f2d94 · 2025-01-24T10:27:33.000+10:00
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -47,7 +47,7 @@
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.6" />
     <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.7" />
     <PackageVersion Include="NuGet.Versioning" Version="6.12.1" />
-    <PackageVersion Include="NUnit" Version="4.2.2" />
+    <PackageVersion Include="NUnit" Version="4.3.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="Particular.Approvals" Version="2.0.0" />
diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs
@@ -66,8 +66,8 @@ public async Task A_new_message_with_edited_headers_is_sent()
             {
                 Assert.That(context.EditedMessageId, Is.Not.EqualTo(context.OriginalMessageId));
                 Assert.That(context.OriginalMessageFailure.Status, Is.EqualTo(FailedMessageStatus.Resolved));
-                Assert.That(context.EditedMessageHeaders["AcceptanceTest.NewHeader"], Is.EqualTo("42").AsCollection);
-                Assert.That(context.EditedMessageHeaders["ServiceControl.EditOf"], Is.EqualTo(context.UniqueMessageId).AsCollection);
+                Assert.That(context.EditedMessageHeaders["AcceptanceTest.NewHeader"], Is.EqualTo("42"));
+                Assert.That(context.EditedMessageHeaders["ServiceControl.EditOf"], Is.EqualTo(context.UniqueMessageId));
             });
         }
 
diff --git a/src/ServiceControl.Persistence.RavenDB/ConnectedApplicationsDataStore.cs b/src/ServiceControl.Persistence.RavenDB/ConnectedApplicationsDataStore.cs
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/IConnectedApplicationsDataStore.cs b/src/ServiceControl.Persistence/IConnectedApplicationsDataStore.cs
diff --git a/src/ServiceControl.UnitTests/API/APIApprovals.cs b/src/ServiceControl.UnitTests/API/APIApprovals.cs
@@ -19,6 +19,7 @@
     using ServiceBus.Management.Infrastructure.Settings;
     using ServiceControl.Infrastructure.Api;
     using ServiceControl.Infrastructure.WebApi;
+    using ServiceControl.Monitoring.HeartbeatMonitoring;
 
     [TestFixture]
     class APIApprovals
@@ -34,7 +35,7 @@ public async Task RootPathValue()
                     new ActiveLicense(null) { IsValid = true },
                     new Settings(),
                     null,
-                    null
+                    new MassTransitConnectorHeartbeatStatus()
                 )
             )
             {
diff --git a/src/ServiceControl/Infrastructure/Api/ConfigurationApi.cs b/src/ServiceControl/Infrastructure/Api/ConfigurationApi.cs
@@ -8,16 +8,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Configuration;
+using Monitoring.HeartbeatMonitoring;
 using Particular.ServiceControl.Licensing;
 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
+    IHttpClientFactory httpClientFactory, MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : IConfigurationApi
 {
     public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToken)
     {
@@ -51,7 +50,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,13 +84,10 @@ public async Task<object> GetConfig(CancellationToken cancellationToken)
             {
                 settings.HeartbeatGracePeriod
             },
-            ConnectedApplications = new
-            {
-                ConnectedApplications = await connectedApplicationsDataStore.GetConnectedApplications()
-            }
+            MassTransitConnector = connectorHeartbeatStatus.LastHeartbeat
         };
 
-        return content;
+        return Task.FromResult(content);
     }
 
     public async Task<RemoteConfiguration[]> GetRemoteConfigs(CancellationToken cancellationToken = default)
diff --git a/src/ServiceControl/Licensing/ActiveLicense.cs b/src/ServiceControl/Licensing/ActiveLicense.cs
@@ -1,15 +1,16 @@
 ﻿namespace Particular.ServiceControl.Licensing
 {
-    using System.Threading.Tasks;
-    using System.Threading;
     using System;
+    using System.Threading;
+    using System.Threading.Tasks;
     using global::ServiceControl.LicenseManagement;
     using global::ServiceControl.Persistence;
     using NServiceBus.Logging;
 
     public class ActiveLicense(ITrialLicenseDataProvider trialLicenseDataProvider)
     {
         public bool IsValid { get; set; }
+        public bool IsEvaluation { get; set; }
 
         public LicenseDetails Details { get; set; }
 
@@ -22,6 +23,8 @@ public async Task Refresh(CancellationToken cancellationToken)
             Details = await ValidateTrialLicense(detectedLicense.Details, trialLicenseDataProvider, cancellationToken);
 
             IsValid = !Details.HasLicenseExpired();
+
+            IsEvaluation = detectedLicense.IsEvaluationLicense;
         }
 
         internal static async Task<LicenseDetails> ValidateTrialLicense(LicenseDetails licenseDetails, ITrialLicenseDataProvider trialLicenseDataProvider, CancellationToken cancellationToken)
diff --git a/src/ServiceControl/Licensing/LicenseController.cs b/src/ServiceControl/Licensing/LicenseController.cs
@@ -3,13 +3,13 @@
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.AspNetCore.Mvc;
+    using Monitoring.HeartbeatMonitoring;
     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, MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : ControllerBase
     {
         [HttpGet]
         [Route("license")]
@@ -31,21 +31,14 @@ 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 = connectorHeartbeatStatus.LastHeartbeat == null
+                    ? $"https://particular.net/extend-your-trial?p={clientName}"
+                    : $"https://particular.net/license/mt?p={clientName}&t={(activeLicense.IsEvaluation ? 0 : 1)}"
             };
 
             return licenseInfo;
         }
 
-        async Task<string> BuildConnectedApplicationsListPart()
-        {
-            var connectedApplications = await connectedApplicationsStore.GetConnectedApplications();
-
-            return connectedApplications != null
-                ? $"&ca={string.Join(',', connectedApplications)}"
-                : string.Empty;
-        }
-
         public class LicenseInfo
         {
             public bool TrialLicense { get; set; }
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;
diff --git a/src/ServiceControl/Monitoring/HeartbeatMonitoring/InternalMessages/MassTransitConnectorHeartbeat.cs b/src/ServiceControl/Monitoring/HeartbeatMonitoring/InternalMessages/MassTransitConnectorHeartbeat.cs
@@ -0,0 +1,27 @@
+namespace ServiceControl.Connector.MassTransit;
+
+using System;
+using NServiceBus;
+
+public class MassTransitConnectorHeartbeat : IMessage
+{
+    public required string Version { get; set; }
+    public required ErrorQueue[] ErrorQueues { get; set; }
+    public required LogEntry[] Logs { get; set; }
+    public required DateTimeOffset SentDateTimeOffset { get; set; }
+}
+
+#pragma warning disable CA1711
+public class ErrorQueue
+#pragma warning restore CA1711
+{
+    public required string Name { get; set; }
+    public required bool Ingesting { get; set; }
+}
+
+public class LogEntry
+{
+    public string Message { get; set; }
+    public DateTimeOffset Date { get; set; }
+    public string Level { get; set; }
+}
diff --git a/src/ServiceControl/Monitoring/HeartbeatMonitoring/MassTransitConnectorHeartbeatStatus.cs b/src/ServiceControl/Monitoring/HeartbeatMonitoring/MassTransitConnectorHeartbeatStatus.cs
@@ -0,0 +1,11 @@
+#nullable enable
+namespace ServiceControl.Monitoring.HeartbeatMonitoring;
+
+using Connector.MassTransit;
+
+public class MassTransitConnectorHeartbeatStatus
+{
+    public MassTransitConnectorHeartbeat? LastHeartbeat { get; private set; }
+
+    public void Update(MassTransitConnectorHeartbeat lastHeartbeat) => LastHeartbeat = lastHeartbeat;
+}
diff --git a/src/ServiceControl/Monitoring/HeartbeatMonitoringComponent.cs b/src/ServiceControl/Monitoring/HeartbeatMonitoringComponent.cs
@@ -4,6 +4,7 @@
     using EndpointControl.Handlers;
     using EventLog;
     using ExternalIntegrations;
+    using HeartbeatMonitoring;
     using Infrastructure.DomainEvents;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;
@@ -21,6 +22,7 @@ public override void Configure(Settings settings, ITransportCustomization transp
             hostBuilder.Services.AddHostedService<HeartbeatEndpointSettingsSyncHostedService>();
 
             hostBuilder.Services.AddSingleton<IEndpointInstanceMonitoring, EndpointInstanceMonitoring>();
+            hostBuilder.Services.AddSingleton<MassTransitConnectorHeartbeatStatus>();
 
             hostBuilder.Services.AddDomainEventHandler<MonitoringDataPersister>();
 
diff --git a/src/ServiceControl/Monitoring/Transport/MassTransitConnectorHeartbeatHandler.cs b/src/ServiceControl/Monitoring/Transport/MassTransitConnectorHeartbeatHandler.cs
@@ -0,0 +1,19 @@
+namespace ServiceControl.Monitoring;
+
+using System.Threading.Tasks;
+using Connector.MassTransit;
+using HeartbeatMonitoring;
+using NServiceBus;
+
+class MassTransitConnectorHeartbeatHandler(MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : IHandleMessages<MassTransitConnectorHeartbeat>
+{
+    public Task Handle(MassTransitConnectorHeartbeat message, IMessageHandlerContext context)
+    {
+        if (connectorHeartbeatStatus.LastHeartbeat == null || message.SentDateTimeOffset > connectorHeartbeatStatus.LastHeartbeat.SentDateTimeOffset)
+        {
+            connectorHeartbeatStatus.Update(message);
+        }
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/ServiceControl/Operations/MassTransitDetector.cs b/src/ServiceControl/Operations/MassTransitDetector.cs

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ public async Task A_new_message_with_edited_headers_is_sent()`
`66`	`66`	`{`
`67`	`67`	`Assert.That(context.EditedMessageId, Is.Not.EqualTo(context.OriginalMessageId));`
`68`	`68`	`Assert.That(context.OriginalMessageFailure.Status, Is.EqualTo(FailedMessageStatus.Resolved));`
`69`		`- Assert.That(context.EditedMessageHeaders["AcceptanceTest.NewHeader"], Is.EqualTo("42").AsCollection);`
`70`		`- Assert.That(context.EditedMessageHeaders["ServiceControl.EditOf"], Is.EqualTo(context.UniqueMessageId).AsCollection);`
	`69`	`+ Assert.That(context.EditedMessageHeaders["AcceptanceTest.NewHeader"], Is.EqualTo("42"));`
	`70`	`+ Assert.That(context.EditedMessageHeaders["ServiceControl.EditOf"], Is.EqualTo(context.UniqueMessageId));`
`71`	`71`	`});`
`72`	`72`	`}`
`73`	`73`
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
`@@ -19,6 +19,7 @@`
`19`	`19`	`using ServiceBus.Management.Infrastructure.Settings;`
`20`	`20`	`using ServiceControl.Infrastructure.Api;`
`21`	`21`	`using ServiceControl.Infrastructure.WebApi;`
	`22`	`+ using ServiceControl.Monitoring.HeartbeatMonitoring;`
`22`	`23`
`23`	`24`	`[TestFixture]`
`24`	`25`	`class APIApprovals`
`@@ -34,7 +35,7 @@ public async Task RootPathValue()`
`34`	`35`	`new ActiveLicense(null) { IsValid = true },`
`35`	`36`	`new Settings(),`
`36`	`37`	`null,`
`37`		`- null`
	`38`	`+ new MassTransitConnectorHeartbeatStatus()`
`38`	`39`	`)`
`39`	`40`	`)`
`40`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,15 @@`
`8`	`8`	`using System.Threading;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using Configuration;`
	`11`	`+using Monitoring.HeartbeatMonitoring;`
`11`	`12`	`using Particular.ServiceControl.Licensing;`
`12`	`13`	`using ServiceBus.Management.Infrastructure.Settings;`
`13`	`14`	`using ServiceControl.Api;`
`14`	`15`	`using ServiceControl.Api.Contracts;`
`15`		`-using ServiceControl.Persistence;`
`16`	`16`
`17`	`17`	`class ConfigurationApi(ActiveLicense license,`
`18`	`18`	`Settings settings,`
`19`		`- IConnectedApplicationsDataStore connectedApplicationsDataStore,`
`20`		`- IHttpClientFactory httpClientFactory) : IConfigurationApi`
	`19`	`+ IHttpClientFactory httpClientFactory, MassTransitConnectorHeartbeatStatus connectorHeartbeatStatus) : IConfigurationApi`
`21`	`20`	`{`
`22`	`21`	`public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToken)`
`23`	`22`	`{`
`@@ -51,7 +50,7 @@ public Task<RootUrls> GetUrls(string baseUrl, CancellationToken cancellationToke`
`51`	`50`	`}`
`52`	`51`
`53`	`52`
`54`		`- public async Task<object> GetConfig(CancellationToken cancellationToken)`
	`53`	`+ public Task<object> GetConfig(CancellationToken cancellationToken)`
`55`	`54`	`{`
`56`	`55`	`object content = new`
`57`	`56`	`{`
`@@ -85,13 +84,10 @@ public async Task<object> GetConfig(CancellationToken cancellationToken)`
`85`	`84`	`{`
`86`	`85`	`settings.HeartbeatGracePeriod`
`87`	`86`	`},`
`88`		`- ConnectedApplications = new`
`89`		`- {`
`90`		`- ConnectedApplications = await connectedApplicationsDataStore.GetConnectedApplications()`
`91`		`- }`
	`87`	`+ MassTransitConnector = connectorHeartbeatStatus.LastHeartbeat`
`92`	`88`	`};`
`93`	`89`
`94`		`- return content;`
	`90`	`+ return Task.FromResult(content);`
`95`	`91`	`}`
`96`	`92`
`97`	`93`	`public async Task<RemoteConfiguration[]> GetRemoteConfigs(CancellationToken cancellationToken = default)`