From 6ebb8fdad1d9763225210e8501204cf0514c64bf Mon Sep 17 00:00:00 2001 From: Mike Minutillo Date: Tue, 25 Aug 2026 10:47:23 +0800 Subject: [PATCH 1/2] Remove TotalThroughput It is not used and the way it is currently calculated is incorrect --- .../LicensingComponent_Report_Signature_Tests.cs | 3 --- src/Particular.LicensingComponent.Report/Report.cs | 6 ------ 2 files changed, 9 deletions(-) diff --git a/src/Particular.LicensingComponent.Report.UnitTests/LicensingComponent_Report_Signature_Tests.cs b/src/Particular.LicensingComponent.Report.UnitTests/LicensingComponent_Report_Signature_Tests.cs index 0a5c656..495b699 100644 --- a/src/Particular.LicensingComponent.Report.UnitTests/LicensingComponent_Report_Signature_Tests.cs +++ b/src/Particular.LicensingComponent.Report.UnitTests/LicensingComponent_Report_Signature_Tests.cs @@ -82,7 +82,6 @@ public void Should_be_able_to_read_a_V1_report() Assert.That(data.Queues.All(q => !q.NoDataOrSendOnly)); Assert.That(data.Queues.All(q => q.EndpointIndicators is null)); - Assert.That(data.TotalThroughput, Is.EqualTo(0)); Assert.That(data.TotalQueues, Is.EqualTo(7)); Assert.That(report.Signature, Is.EqualTo("ybIzoo9ogZtbSm5+jJa3GxncjCX3fxAfiLSI7eogG20KjJiv43aCE+7Lsvhkat7AALM34HgwI3VsgzRmyLYXD5n0+XRrWXNgeRGbLEG6d1W2djLRHNjXo423zpGTYDeMq3vhI9yAcil0K0dCC/ZCnw8dPd51pNmgKYIvrfELW0hyN70trUeCMDhYRfXruWLNe8Hfy+tS8Bm13B5vknXNlAjBIuGjXn3XILRRSVrTbb4QMIRzSluSnSTFPTCyE9wMWwC0BUGSf7ZEA0XdeN6UkaO/5URSOQVesiSLRqQWbfUc87XlY1hMs5Z7kLSOr5WByIQIfQKum1nGVjLMzshyhQ==")); @@ -118,7 +117,6 @@ public void Should_be_able_to_read_a_V2_report() Assert.That(data.Queues.Any(q => q.QueueName == "Endpoint2" && q.DailyThroughputFromBroker.Any(t => t.MessageCount == 60 && t.DateUTC.ToString("yyyy-MM-dd") == "2024-04-24"))); Assert.That(data.Queues.Any(q => q.EndpointIndicators?.Contains("KnownEndpoint") ?? false), Is.True); - Assert.That(data.TotalThroughput, Is.EqualTo(249)); Assert.That(data.TotalQueues, Is.EqualTo(5)); Assert.That(data.EnvironmentInformation.AuditServicesData.Versions.Count, Is.EqualTo(1)); Assert.That(data.EnvironmentInformation.AuditServicesData.Transports.Count, Is.EqualTo(1)); @@ -218,7 +216,6 @@ SignedReport CreateReport() EndTime = end, ReportDuration = end - start, Queues = queues, - TotalThroughput = queues.Sum(q => q.Throughput ?? 0), TotalQueues = queues.Length, Prefix = "SomePrefix", IgnoredQueues = new[] { "ignore1", "ignore2", "ignore3" }, diff --git a/src/Particular.LicensingComponent.Report/Report.cs b/src/Particular.LicensingComponent.Report/Report.cs index 00131b9..c511174 100644 --- a/src/Particular.LicensingComponent.Report/Report.cs +++ b/src/Particular.LicensingComponent.Report/Report.cs @@ -83,12 +83,6 @@ public record Report /// public QueueThroughput[] Queues { get; init; } - /// - /// Total throughput for all queues - /// - [JsonIgnore(Condition = JsonIgnoreCondition.Never)] // Must be serialized even if 0 to maintain compatibility with old report signatures - public long TotalThroughput { get; init; } - /// /// Total number of detected queues /// From 8b05ca810832e234844e84c909fb3d114c2b61a5 Mon Sep 17 00:00:00 2001 From: Mike Minutillo Date: Tue, 25 Aug 2026 11:01:26 +0800 Subject: [PATCH 2/2] Fix approval tests --- .../ApprovalFiles/ApiApprovals.Approve.approved.txt | 2 -- ...re_Tests.Should_serialize_report_with_signature.approved.txt | 1 - 2 files changed, 3 deletions(-) diff --git a/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/ApiApprovals.Approve.approved.txt b/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/ApiApprovals.Approve.approved.txt index 3188bc9..88ec48e 100644 --- a/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/ApiApprovals.Approve.approved.txt +++ b/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/ApiApprovals.Approve.approved.txt @@ -55,8 +55,6 @@ namespace Particular.LicensingComponent.Report public string ToolVersion { get; init; } [System.Text.Json.Serialization.JsonIgnore(Condition=System.Text.Json.Serialization.JsonIgnoreCondition.Never)] public int TotalQueues { get; init; } - [System.Text.Json.Serialization.JsonIgnore(Condition=System.Text.Json.Serialization.JsonIgnoreCondition.Never)] - public long TotalThroughput { get; init; } } public class ReportValidationResult { diff --git a/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/LicensingComponent_Report_Signature_Tests.Should_serialize_report_with_signature.approved.txt b/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/LicensingComponent_Report_Signature_Tests.Should_serialize_report_with_signature.approved.txt index fba23e2..0b9d3ad 100644 --- a/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/LicensingComponent_Report_Signature_Tests.Should_serialize_report_with_signature.approved.txt +++ b/src/Particular.LicensingComponent.Report.UnitTests/ApprovalFiles/LicensingComponent_Report_Signature_Tests.Should_serialize_report_with_signature.approved.txt @@ -22,7 +22,6 @@ "NoDataOrSendOnly": true } ], - "TotalThroughput": 10042, "TotalQueues": 3, "IgnoredQueues": [ "ignore1",