From 3bfe4773bb61c1de2590945c5d287262b0216a38 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 12 Jun 2025 08:31:51 -0600 Subject: [PATCH 1/4] User indicator update for transactional session --- src/Particular.LicensingComponent.Contracts/UserIndicator.cs | 4 +++- .../ThroughputCollector_Report_Indicator_Tests.cs | 4 ++-- .../ThroughputCollector_Report_Throughput_Tests.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Particular.LicensingComponent.Contracts/UserIndicator.cs b/src/Particular.LicensingComponent.Contracts/UserIndicator.cs index a82fb5e0f1..cd86ac8d9e 100644 --- a/src/Particular.LicensingComponent.Contracts/UserIndicator.cs +++ b/src/Particular.LicensingComponent.Contracts/UserIndicator.cs @@ -7,7 +7,9 @@ public enum UserIndicator { NServiceBusEndpoint, NotNServiceBusEndpoint, - SendOnlyOrTransactionSessionEndpoint, + SendOnlyOrTransactionSessionEndpoint, // For backward compatibility with older versions of Usage Report in ServicePulse + TransactionalSessionProcessorEndpoint, + SendOnlyEndpoint, NServiceBusEndpointNoLongerInUse, PlannedToDecommission } \ No newline at end of file diff --git a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Indicator_Tests.cs b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Indicator_Tests.cs index e644bae565..68cab4dac4 100644 --- a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Indicator_Tests.cs +++ b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Indicator_Tests.cs @@ -47,7 +47,7 @@ public async Task Should_return_correct_user_indicators_when_multiple_throughput await DataStore.CreateBuilder() .AddEndpoint("Endpoint1", sources: [ThroughputSource.Broker, ThroughputSource.Monitoring]) .ConfigureEndpoint(ThroughputSource.Broker, - endpoint => endpoint.UserIndicator = UserIndicator.SendOnlyOrTransactionSessionEndpoint.ToString()) + endpoint => endpoint.UserIndicator = UserIndicator.SendOnlyEndpoint.ToString()) .WithThroughput(ThroughputSource.Broker, days: 2) .WithThroughput(ThroughputSource.Monitoring, days: 2) .Build(); @@ -60,6 +60,6 @@ await DataStore.CreateBuilder() Assert.That(report.ReportData.Queues.Length, Is.EqualTo(1)); Assert.That(report.ReportData.Queues[0].UserIndicator, - Is.EqualTo(UserIndicator.SendOnlyOrTransactionSessionEndpoint.ToString())); + Is.EqualTo(UserIndicator.SendOnlyEndpoint.ToString())); } } \ No newline at end of file diff --git a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs index b08f78970a..bb088dcfc1 100644 --- a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs +++ b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs @@ -60,7 +60,7 @@ await DataStore.CreateBuilder() .WithThroughput(days: 2) .AddEndpoint("Endpoint3", sources: [ThroughputSource.Broker]) .ConfigureEndpoint( - endpoint => endpoint.UserIndicator = UserIndicator.SendOnlyOrTransactionSessionEndpoint.ToString()) + endpoint => endpoint.UserIndicator = UserIndicator.SendOnlyEndpoint.ToString()) .WithThroughput(days: 2) .AddEndpoint("Endpoint4", sources: [ThroughputSource.Broker]) .ConfigureEndpoint(endpoint => endpoint.UserIndicator = UserIndicator.PlannedToDecommission.ToString()) From 0c7d00c2f2f80d60588846b024b6b124fd11ebed Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 13 Jun 2025 07:15:32 -0400 Subject: [PATCH 2/4] Removing SendOnlyOrTransactionSessionEndpoint --- src/Particular.LicensingComponent.Contracts/UserIndicator.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Particular.LicensingComponent.Contracts/UserIndicator.cs b/src/Particular.LicensingComponent.Contracts/UserIndicator.cs index cd86ac8d9e..127627c92d 100644 --- a/src/Particular.LicensingComponent.Contracts/UserIndicator.cs +++ b/src/Particular.LicensingComponent.Contracts/UserIndicator.cs @@ -7,7 +7,6 @@ public enum UserIndicator { NServiceBusEndpoint, NotNServiceBusEndpoint, - SendOnlyOrTransactionSessionEndpoint, // For backward compatibility with older versions of Usage Report in ServicePulse TransactionalSessionProcessorEndpoint, SendOnlyEndpoint, NServiceBusEndpointNoLongerInUse, From 7eac0d9b5002c948d3ce624342c521aeee448ea6 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 19 Jun 2025 06:13:29 -0600 Subject: [PATCH 3/4] exclude Particular.Monitoring ServiceControl doesn't have a setting for the monitoring queue. Always exclude hardcoded Particular.Monitoring --- .../Shared/PlatformEndpointHelper.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs b/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs index 69057b71c4..e643c9192b 100644 --- a/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs +++ b/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs @@ -13,6 +13,7 @@ public static bool IsPlatformEndpoint(string endpointName, ThroughputSettings th || endpointName.EndsWith(".TimeoutsDispatcher", StringComparison.OrdinalIgnoreCase) || endpointName.StartsWith($"{throughputSettings.ServiceControlQueue}.", StringComparison.OrdinalIgnoreCase) || endpointName.Equals(ServiceControlSettings.ServiceControlThroughputDataQueue, StringComparison.OrdinalIgnoreCase) + || endpointName.Equals("Particular.Monitoring", StringComparison.OrdinalIgnoreCase) || AuditThroughputCollectorHostedService.AuditQueues.Any(a => endpointName.Equals(a, StringComparison.OrdinalIgnoreCase)); } } From 242493142e4c25d6106a61858777bce47ee0b91e Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 19 Jun 2025 21:56:09 -0600 Subject: [PATCH 4/4] Revert "exclude Particular.Monitoring" This reverts commit 7eac0d9b5002c948d3ce624342c521aeee448ea6. --- .../Shared/PlatformEndpointHelper.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs b/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs index e643c9192b..69057b71c4 100644 --- a/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs +++ b/src/Particular.LicensingComponent/Shared/PlatformEndpointHelper.cs @@ -13,7 +13,6 @@ public static bool IsPlatformEndpoint(string endpointName, ThroughputSettings th || endpointName.EndsWith(".TimeoutsDispatcher", StringComparison.OrdinalIgnoreCase) || endpointName.StartsWith($"{throughputSettings.ServiceControlQueue}.", StringComparison.OrdinalIgnoreCase) || endpointName.Equals(ServiceControlSettings.ServiceControlThroughputDataQueue, StringComparison.OrdinalIgnoreCase) - || endpointName.Equals("Particular.Monitoring", StringComparison.OrdinalIgnoreCase) || AuditThroughputCollectorHostedService.AuditQueues.Any(a => endpointName.Equals(a, StringComparison.OrdinalIgnoreCase)); } }