Skip to content

Remove references to TotalThroughput #5825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikeminutillo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove references to TotalThroughput #5825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...s/ThroughputCollector_Report_Throughput_Tests.Should_generate_correct_report.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
"DailyThroughputFromMonitoring": []
}
],
"TotalThroughput": 249,
"TotalQueues": 5,
"IgnoredQueues": [],
"EnvironmentInformation": {
Expand Down
20 changes: 1 addition & 19 deletions ...ingComponent.UnitTests/ThroughputCollector/ThroughputCollector_Report_Throughput_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand Down Expand Up @@ -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");
}
}
Expand All @@ -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");
}
}
Expand Down Expand Up @@ -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");
}
}
Expand All @@ -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)]
Expand Down
4 changes: 0 additions & 4 deletions ...omponent.UnitTests/ThroughputCollector/ThroughputCollector_SanitizedNameGrouping_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/Particular.LicensingComponent/ThroughputCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ public async Task<SignedReport> 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 }
};

Expand Down
Loading