diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 1dce4cf736..23bbddad80 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -68,7 +68,7 @@ - + diff --git a/src/Particular.LicensingComponent.UnitTests/ApprovalFiles/ThroughputCollector_Report_Throughput_Tests.Should_generate_correct_report.approved.txt b/src/Particular.LicensingComponent.UnitTests/ApprovalFiles/ThroughputCollector_Report_Throughput_Tests.Should_generate_correct_report.approved.txt index dbd701a294..ef9a71cd2f 100644 --- a/src/Particular.LicensingComponent.UnitTests/ApprovalFiles/ThroughputCollector_Report_Throughput_Tests.Should_generate_correct_report.approved.txt +++ b/src/Particular.LicensingComponent.UnitTests/ApprovalFiles/ThroughputCollector_Report_Throughput_Tests.Should_generate_correct_report.approved.txt @@ -146,7 +146,6 @@ "DailyThroughputFromMonitoring": [] } ], - "TotalThroughput": 249, "TotalQueues": 5, "IgnoredQueues": [], "EnvironmentInformation": { 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 46a21a16ac..a89f3082d0 100644 --- a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs +++ b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs @@ -144,11 +144,6 @@ await DataStore.CreateBuilder() Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint1").Throughput, Is.EqualTo(55), $"Incorrect Throughput recorded for Endpoint1"); Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint2").Throughput, Is.EqualTo(65), $"Incorrect Throughput recorded for Endpoint2"); Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint3").Throughput, Is.EqualTo(75), $"Incorrect Throughput recorded for Endpoint3"); - } - - using (Assert.EnterMultipleScope()) - { - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(195), $"Incorrect TotalThroughput recorded"); Assert.That(report.ReportData.TotalQueues, Is.EqualTo(3), $"Incorrect TotalQueues recorded"); } } @@ -182,11 +177,6 @@ await DataStore.CreateBuilder() Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint1").Throughput, Is.EqualTo(65), $"Incorrect Throughput recorded for Endpoint1"); Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint2").Throughput, Is.EqualTo(65), $"Incorrect Throughput recorded for Endpoint2"); Assert.That(report.ReportData.Queues.First(w => w.QueueName == "Endpoint3").Throughput, Is.EqualTo(57), $"Incorrect Throughput recorded for Endpoint3"); - } - - using (Assert.EnterMultipleScope()) - { - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(187), $"Incorrect TotalThroughput recorded"); Assert.That(report.ReportData.TotalQueues, Is.EqualTo(3), $"Incorrect TotalQueues recorded"); } } @@ -206,8 +196,6 @@ public async Task Should_return_correct_throughput_in_report_when_endpoint_has_n using (Assert.EnterMultipleScope()) { Assert.That(report.ReportData.Queues[0].Throughput, Is.EqualTo(0), $"Incorrect Throughput recorded for {report.ReportData.Queues[0].QueueName}"); - - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(0), $"Incorrect TotalThroughput recorded"); Assert.That(report.ReportData.TotalQueues, Is.EqualTo(1), $"Incorrect TotalQueues recorded"); } } @@ -253,7 +241,6 @@ await DataStore.CreateBuilder() //even though the names are different, we should have matched on the sanitized name and hence displayed max throughput from the 2 endpoints Assert.That(report.ReportData.Queues[0].Throughput, Is.EqualTo(75), $"Incorrect Throughput recorded for Endpoint1"); - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(75), $"Incorrect TotalThroughput recorded"); Assert.That(report.ReportData.TotalQueues, Is.EqualTo(1), $"Incorrect TotalQueues recorded"); } } @@ -278,12 +265,7 @@ await DataStore.CreateBuilder() // Assert Assert.That(report, Is.Not.Null); Assert.That(report.ReportData.Queues.Count, Is.EqualTo(1)); - - using (Assert.EnterMultipleScope()) - { - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(75), $"Incorrect TotalThroughput recorded"); - Assert.That(report.ReportData.TotalQueues, Is.EqualTo(1), $"Incorrect TotalQueues recorded"); - } + Assert.That(report.ReportData.TotalQueues, Is.EqualTo(1), $"Incorrect TotalQueues recorded"); } [TestCase(ThroughputSource.Audit)] @@ -320,7 +302,6 @@ await DataStore.CreateBuilder() Assert.That(dailyThroughput, Has.All.Matches( throughput => throughput.DateUTC <= DateOnly.FromDateTime(reportEndDate))); Assert.That(queue.Throughput, Is.EqualTo(55)); - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(55)); } } diff --git a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_SanitizedNameGrouping_Tests.cs b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_SanitizedNameGrouping_Tests.cs index 24cc1783b0..be5498b3a8 100644 --- a/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_SanitizedNameGrouping_Tests.cs +++ b/src/Particular.LicensingComponent.UnitTests/ThroughputCollector/ThroughputCollector_SanitizedNameGrouping_Tests.cs @@ -69,8 +69,6 @@ await DataStore.CreateBuilder() // Assert Assert.That(report, Is.Not.Null); Assert.That(report.ReportData.Queues.Count, Is.EqualTo(1)); - //should see 1 endpoint with both throughputs, and return 60 as the maximum one - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(60)); Assert.That(report.ReportData.Queues.FirstOrDefault(f => f.QueueName == "Endpoint1").DailyThroughputFromAudit.Sum(s => s.MessageCount), Is.EqualTo(60)); Assert.That(report.ReportData.Queues.FirstOrDefault(f => f.QueueName == "Endpoint1").DailyThroughputFromBroker.Sum(s => s.MessageCount), Is.EqualTo(50)); } @@ -122,8 +120,6 @@ await DataStore.CreateBuilder() // Assert Assert.That(report, Is.Not.Null); Assert.That(report.ReportData.Queues.Count, Is.EqualTo(2)); - //two different endpoints hence total throughput is a sum of both of them - Assert.That(report.ReportData.TotalThroughput, Is.EqualTo(110)); } class BrokerThroughputQuery_WithLowerCaseSanitizedNameCleanse : IBrokerThroughputQuery diff --git a/src/Particular.LicensingComponent/ThroughputCollector.cs b/src/Particular.LicensingComponent/ThroughputCollector.cs index 6d9567d8ee..216889344e 100644 --- a/src/Particular.LicensingComponent/ThroughputCollector.cs +++ b/src/Particular.LicensingComponent/ThroughputCollector.cs @@ -166,7 +166,6 @@ public async Task GenerateThroughputReport(string spVersion, DateT IgnoredQueues = [.. ignoredQueueNames], Queues = [.. queueThroughputs], TotalQueues = queueThroughputs.Count, - TotalThroughput = queueThroughputs.Sum(q => q.Throughput ?? 0), EnvironmentInformation = new EnvironmentInformation { AuditServicesData = new AuditServicesData(auditServiceMetadata.Versions, auditServiceMetadata.Transports), EnvironmentData = brokerMetaData.Data } };