Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"NoDataOrSendOnly": true
}
],
"TotalThroughput": 10042,
"TotalQueues": 3,
"IgnoredQueues": [
"ignore1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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=="));
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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" },
Expand Down
6 changes: 0 additions & 6 deletions src/Particular.LicensingComponent.Report/Report.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ public record Report
/// </summary>
public QueueThroughput[] Queues { get; init; }

/// <summary>
/// Total throughput for all queues
/// </summary>
[JsonIgnore(Condition = JsonIgnoreCondition.Never)] // Must be serialized even if 0 to maintain compatibility with old report signatures
public long TotalThroughput { get; init; }

/// <summary>
/// Total number of detected queues
/// </summary>
Expand Down
Loading