Skip to content

Hash queues for identification between reports #5335

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 3 commits into
base: master
Choose a base branch
from
Open

Hash queues for identification between reports #5335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69403ee
Update package
mikeminutillo Feb 27, 2026
99ea0fb
Calculate name hash for queues
mikeminutillo Feb 27, 2026
780132b
Approve new usage report property
mikeminutillo Feb 27, 2026
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
2 changes: 1 addition & 1 deletion src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageVersion Include="Particular.Approvals" Version="2.0.1" />
<PackageVersion Include="Particular.LicensingComponent.Report" Version="1.0.0" />
<PackageVersion Include="Particular.LicensingComponent.Report" Version="1.1.0" />
<PackageVersion Include="Particular.Licensing.Sources" Version="6.1.0" />
<PackageVersion Include="Particular.Obsoletes" Version="1.0.0" />
<PackageVersion Include="Polly.Core" Version="8.6.5" />
Expand Down
5 changes: 5 additions & 0 deletions ...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 @@ -12,6 +12,7 @@
"Queues": [
{
"QueueName": "REDACTED1",
"NameHash": "FAD4132E2E84D00CFDCF59DEE29B4353D5AFD88C2268113B63E10F8562F0415D",
"Throughput": 65,
"EndpointIndicators": [
"KnownEndpoint"
Expand Down Expand Up @@ -41,6 +42,7 @@
},
{
"QueueName": "Endpoint2",
"NameHash": "CC025A7DAEDE6B7354219CD6CBE69F6CC20D9A4E50AE4697D0339D83F1916B0B",
"Throughput": 65,
"EndpointIndicators": [
"KnownEndpoint"
Expand Down Expand Up @@ -70,6 +72,7 @@
},
{
"QueueName": "Endpoint3",
"NameHash": "41F376A830F79D28A6C4AB64BFBAB49E3460266F2EF832D5D323A3D15D332935",
"Throughput": 57,
"EndpointIndicators": [
"KnownEndpoint"
Expand Down Expand Up @@ -108,6 +111,7 @@
},
{
"QueueName": "Endpoint4",
"NameHash": "F3B76C9479C36F3759A00E4A6C899A60B310349888FC36D84C07D9EC14BC3F2A",
"Throughput": 47,
"EndpointIndicators": [],
"UserIndicator": "PlannedToDecommission",
Expand All @@ -127,6 +131,7 @@
},
{
"QueueName": "Endpoint5",
"NameHash": "4843958694AE6C4DE89E992E0C3381120824212D35506B021F062F9D263FFB9B",
"Throughput": 15,
"EndpointIndicators": [],
"UserIndicator": "NotNServiceBusEndpoint",
Expand Down
29 changes: 4 additions & 25 deletions src/Particular.LicensingComponent/ThroughputCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using AuditThroughput;
using Contracts;
using MonitoringThroughput;
using Particular.LicensingComponent.Report.Utility;
using Persistence;
using Report;
using ServiceControl.Transports.BrokerThroughput;
Expand Down Expand Up @@ -112,9 +113,8 @@ async Task<ReportGenerationState> GetReportGenerationStateForNonBroker(Cancellat

public async Task<SignedReport> GenerateThroughputReport(string spVersion, DateTime? reportEndDate, CancellationToken cancellationToken)
{
(string Mask, string Replacement)[] masks = [];
var reportMasks = await dataStore.GetReportMasks(cancellationToken);
CreateMasks(reportMasks.ToArray());
var masker = new Masker([.. reportMasks]);

var queueThroughputs = new List<QueueThroughput>();
List<string> ignoredQueueNames = [];
Expand All @@ -126,7 +126,8 @@ public async Task<SignedReport> GenerateThroughputReport(string spVersion, DateT
//get all data that we have, including daily values
var queueThroughput = new QueueThroughput
{
QueueName = Mask(endpointData.Name),
NameHash = OneWayHasher.CalculateOneWayHash(endpointData.Name),
QueueName = masker.Mask(endpointData.Name),
UserIndicator = endpointData.UserIndicator,
EndpointIndicators = endpointData.EndpointIndicators ?? [],
NoDataOrSendOnly = endpointData.ThroughputData.Sum() == 0,
Expand Down Expand Up @@ -181,28 +182,6 @@ public async Task<SignedReport> GenerateThroughputReport(string spVersion, DateT

var throughputReport = new SignedReport { ReportData = report, Signature = Signature.SignReport(report) };
return throughputReport;

void CreateMasks(string[] wordsToMask)
{
var number = 0;
masks = wordsToMask
.Select(mask =>
{
number++;
return (mask, $"REDACTED{number}");
})
.ToArray();
}

string Mask(string stringToMask)
{
foreach (var (mask, replacement) in masks)
{
stringToMask = stringToMask.Replace(mask, replacement, StringComparison.OrdinalIgnoreCase);
}

return stringToMask;
}
}

async IAsyncEnumerable<EndpointData> GetDistinctEndpointData([EnumeratorCancellation] CancellationToken cancellationToken)
Expand Down