Add monthly highest usage

Author: johnsimons

src/Particular.LicensingComponent.Contracts/EndpointThroughputSummary.cs

@@ -7,6 +7,7 @@ public class EndpointThroughputSummary
     public bool IsKnownEndpoint { get; set; }
     public string UserIndicator { get; set; }
     public long MaxDailyThroughput { get; set; }
+    public long MaxMonthlyThroughput { get; set; }
 }
 
 public class UpdateUserIndicator

src/Particular.LicensingComponent.Contracts/ThroughputSettings.cs

@@ -2,7 +2,13 @@
 
 using ServiceControl.Configuration;
 
-public class ThroughputSettings(string serviceControlQueue, string errorQueue, string transportType, string customerName, string serviceControlVersion)
+public class ThroughputSettings(
+    string serviceControlQueue,
+    string errorQueue,
+    string transportType,
+    string customerName,
+    string serviceControlVersion,
+    string licenseEdition)
 {
     public static readonly SettingsRootNamespace SettingsNamespace = new("LicensingComponent");
 
@@ -14,4 +20,5 @@ public class ThroughputSettings(string serviceControlQueue, string errorQueue, s
     public string TransportType { get; set; } = transportType;
     public string CustomerName { get; } = customerName;
     public string ServiceControlVersion { get; } = serviceControlVersion;
+    public string LicenseEdition { get; } = licenseEdition;
 }

src/Particular.LicensingComponent/LicensingComponentHostBuilderExtensions.cs

@@ -10,11 +10,11 @@ namespace Particular.LicensingComponent;
 
 public static class LicensingComponentHostBuilderExtensions
 {
-    public static IHostApplicationBuilder AddLicensingComponent(this IHostApplicationBuilder hostBuilder, string transportType, string errorQueue, string serviceControlQueue, string customerName, string serviceControlVersion)
+    public static IHostApplicationBuilder AddLicensingComponent(this IHostApplicationBuilder hostBuilder, string transportType, string errorQueue, string serviceControlQueue, string customerName, string serviceControlVersion, string licenseEdition)
     {
         var services = hostBuilder.Services;
 
-        var throughputSettings = new ThroughputSettings(serviceControlQueue, errorQueue, transportType, customerName, serviceControlVersion);
+        var throughputSettings = new ThroughputSettings(serviceControlQueue, errorQueue, transportType, customerName, serviceControlVersion, licenseEdition);
         services.AddSingleton(throughputSettings);
         services.AddHostedService<AuditThroughputCollectorHostedService>();
         services.AddHostedService<MonitoringThroughputHostedService>();

src/Particular.LicensingComponent/ThroughputCollector.cs

@@ -71,7 +71,8 @@ public async Task<List<EndpointThroughputSummary>> GetThroughputSummary(Cancella
                 Name = endpointData.Name,
                 UserIndicator = endpointData.UserIndicator ?? (endpointData.IsKnownEndpoint ? Contracts.UserIndicator.NServiceBusEndpoint.ToString() : string.Empty),
                 IsKnownEndpoint = endpointData.IsKnownEndpoint,
-                MaxDailyThroughput = endpointData.ThroughputData.Max()
+                MaxDailyThroughput = endpointData.ThroughputData.MaxDailyThroughput(),
+                MaxMonthlyThroughput = endpointData.ThroughputData.MaxMonthlyThroughput()
             };
 
             endpointSummaries.Add(endpointSummary);
@@ -130,7 +131,7 @@ public async Task<SignedReport> GenerateThroughputReport(string spVersion, DateT
                 EndpointIndicators = endpointData.EndpointIndicators ?? [],
                 NoDataOrSendOnly = endpointData.ThroughputData.Sum() == 0,
                 Scope = endpointData.Scope ?? "",
-                Throughput = endpointData.ThroughputData.Max(),
+                Throughput = endpointData.ThroughputData.MaxDailyThroughput(),
                 DailyThroughputFromAudit = endpointData.ThroughputData.FromSource(ThroughputSource.Audit).Select(s => new DailyThroughput { DateUTC = s.DateUTC, MessageCount = s.MessageCount }).ToArray(),
                 DailyThroughputFromMonitoring = endpointData.ThroughputData.FromSource(ThroughputSource.Monitoring).Select(s => new DailyThroughput { DateUTC = s.DateUTC, MessageCount = s.MessageCount }).ToArray(),
                 DailyThroughputFromBroker = notAnNsbEndpoint ? [] : endpointData.ThroughputData.FromSource(ThroughputSource.Broker).Select(s => new DailyThroughput { DateUTC = s.DateUTC, MessageCount = s.MessageCount }).ToArray()

src/Particular.LicensingComponent/ThroughputDataExtensions.cs

@@ -10,7 +10,7 @@ public static IEnumerable<EndpointDailyThroughput> FromSource(this List<Throughp
 
     public static long Sum(this List<ThroughputData> throughputs) => throughputs.SelectMany(t => t).Sum(kvp => kvp.Value);
 
-    public static long Max(this List<ThroughputData> throughputs)
+    public static long MaxDailyThroughput(this List<ThroughputData> throughputs)
     {
         var items = throughputs.SelectMany(t => t).ToArray();
 
@@ -22,6 +22,22 @@ public static long Max(this List<ThroughputData> throughputs)
         return 0;
     }
 
+    public static long MaxMonthlyThroughput(this List<ThroughputData> throughputs)
+    {
+        var monthlySums = throughputs
+            .SelectMany(data => data)
+            .GroupBy(kvp => $"{kvp.Key.Year}-{kvp.Key.Month}")
+            .Select(group => group.Sum(kvp => kvp.Value))
+            .ToArray();
+
+        if (monthlySums.Any())
+        {
+            return monthlySums.Max();
+        }
+
+        return 0;
+    }
+
     public static bool HasDataFromSource(this IDictionary<string, IEnumerable<ThroughputData>> throughputPerQueue, ThroughputSource source) =>
         throughputPerQueue.Any(queueName => queueName.Value.Any(data => data.ThroughputSource == source && data.Count > 0));
 }

src/ServiceControl.Persistence.RavenDB/Throughput/LicensingDataStore.cs

@@ -122,14 +122,14 @@ public async Task SaveEndpoint(Endpoint endpoint, CancellationToken cancellation
 
     public async Task<IDictionary<string, IEnumerable<ThroughputData>>> GetEndpointThroughputByQueueName(IList<string> queueNames, CancellationToken cancellationToken)
     {
-        var results = queueNames.ToDictionary(queueName => queueName, queueNames => new List<ThroughputData>() as IEnumerable<ThroughputData>);
+        var results = queueNames.ToDictionary(queueName => queueName, _ => new List<ThroughputData>() as IEnumerable<ThroughputData>);
 
         var store = await storeProvider.GetDocumentStore(cancellationToken);
         using IAsyncDocumentSession session = store.OpenAsyncSession(databaseConfiguration.Name);
 
         var query = session.Query<EndpointDocument>()
             .Where(document => document.SanitizedName.In(queueNames))
-            .Include(builder => builder.IncludeTimeSeries(ThroughputTimeSeriesName));
+            .Include(builder => builder.IncludeTimeSeries(ThroughputTimeSeriesName, DateTime.UtcNow.AddMonths(-14)));
 
         var documents = await query.ToListAsync(cancellationToken);
 

src/ServiceControl/Licensing/LicensingComponent.cs

@@ -11,13 +11,17 @@ namespace Particular.ServiceControl;
 class LicensingComponent : ServiceControlComponent
 {
     public override void Configure(Settings settings, ITransportCustomization transportCustomization,
-        IHostApplicationBuilder hostBuilder) =>
+        IHostApplicationBuilder hostBuilder)
+    {
+        var licenseDetails = LicenseManager.FindLicense().Details;
         hostBuilder.AddLicensingComponent(
             TransportManifestLibrary.Find(settings.TransportType)?.Name ?? settings.TransportType,
             settings.ErrorQueue,
             settings.InstanceName,
-            LicenseManager.FindLicense().Details.RegisteredTo,
-            ServiceControlVersion.GetFileVersion());
+            licenseDetails.RegisteredTo,
+            ServiceControlVersion.GetFileVersion(),
+            licenseDetails.Edition);
+    }
 
     public override void Setup(Settings settings, IComponentInstallationContext context,
         IHostApplicationBuilder hostBuilder) =>