Migrate monitoring VariableHistoryIntervalStore base class to ConcurrentDictionary (#4532)

Author: cquirosj

src/ServiceControl.Monitoring.UnitTests/API/AggregationTests.cs

@@ -18,15 +18,17 @@ public class AggregationTests
         EndpointInstanceActivityTracker activityTracker;
         IEndpointMetricsApi endpointMetricsApi;
 
+        MessageTypeRegistry messageTypeRegistry;
+
         [SetUp]
         public void Setup()
         {
             settings = new Settings { EndpointUptimeGracePeriod = TimeSpan.FromMinutes(5) };
             activityTracker = new EndpointInstanceActivityTracker(settings, TimeProvider.System);
             processingTimeStore = new ProcessingTimeStore();
             endpointRegistry = new EndpointRegistry();
+            messageTypeRegistry = new MessageTypeRegistry();
 
-            var messageTypeRegistry = new MessageTypeRegistry();
             var breakdownProviders = new IProvideBreakdown[]
             {
                 processingTimeStore,
@@ -47,20 +49,29 @@ public void MetricAggregationByInstanceIsScopedToLogicalEndpoint()
             endpointRegistry.Record(instanceAId);
             endpointRegistry.Record(instanceBId);
 
+            messageTypeRegistry.Record(new EndpointMessageType(instanceAId.EndpointName, enclosedMessageTypes: "MessageA"));
+            messageTypeRegistry.Record(new EndpointMessageType(instanceBId.EndpointName, enclosedMessageTypes: "MessageA"));
+
             var period = HistoryPeriod.FromMinutes(EndpointMetricsApi.DefaultHistory);
             var now = DateTime.UtcNow.Subtract(new TimeSpan(period.IntervalSize.Ticks * period.DelayedIntervals));
 
             var dataA = new RawMessage.Entry { DateTicks = now.Ticks, Value = 5 };
             var dataB = new RawMessage.Entry { DateTicks = now.Ticks, Value = 10 };
 
-            processingTimeStore.Store([dataA], instanceAId, EndpointMessageType.Unknown(instanceAId.EndpointName));
-            processingTimeStore.Store([dataB], instanceBId, EndpointMessageType.Unknown(instanceBId.EndpointName));
+            processingTimeStore.Store([dataA], instanceAId, new EndpointMessageType(instanceAId.EndpointName, enclosedMessageTypes: "MessageA"));
+            processingTimeStore.Store([dataB], instanceBId, new EndpointMessageType(instanceBId.EndpointName, enclosedMessageTypes: "MessageA"));
 
-            var result = endpointMetricsApi.GetSingleEndpointMetrics(instanceAId.EndpointName);
+            var logicalEndpointAMetrics = endpointMetricsApi.GetSingleEndpointMetrics(instanceAId.EndpointName);
+            var logicalEndpointBMetrics = endpointMetricsApi.GetSingleEndpointMetrics(instanceBId.EndpointName);
 
-            var model = result;
+            Assert.Multiple(() =>
+            {
+                Assert.That(logicalEndpointAMetrics.Instances[0].Metrics["ProcessingTime"].Average, Is.EqualTo(5));
+                Assert.That(logicalEndpointBMetrics.Instances[0].Metrics["ProcessingTime"].Average, Is.EqualTo(10));
 
-            Assert.That(model.Instances[0].Metrics["ProcessingTime"].Average, Is.EqualTo(5));
+                Assert.That(logicalEndpointAMetrics.MessageTypes[0].Metrics["ProcessingTime"].Average, Is.EqualTo(5));
+                Assert.That(logicalEndpointBMetrics.MessageTypes[0].Metrics["ProcessingTime"].Average, Is.EqualTo(10));
+            });
         }
 
         [Test]

src/ServiceControl.Monitoring/Infrastructure/VariableHistoryIntervalStore.cs

@@ -1,7 +1,7 @@
 namespace ServiceControl.Monitoring.Infrastructure
 {
     using System;
-    using System.Collections.Generic;
+    using System.Collections.Concurrent;
     using Messaging;
 
     public class VariableHistoryIntervalStore<BreakdownT> : IProvideBreakdownBy<BreakdownT>
@@ -12,7 +12,7 @@ public VariableHistoryIntervalStore()
 
             foreach (var period in HistoryPeriod.All)
             {
-                histories.Add(period, new IntervalsStore<BreakdownT>(period.IntervalSize, period.NumberOfIntervals, period.DelayedIntervals));
+                histories.TryAdd(period, new IntervalsStore<BreakdownT>(period.IntervalSize, period.NumberOfIntervals, period.DelayedIntervals));
             }
         }
 
@@ -34,6 +34,6 @@ public void Store(BreakdownT id, RawMessage.Entry[] entries)
             }
         }
 
-        Dictionary<HistoryPeriod, IntervalsStore<BreakdownT>> histories;
+        ConcurrentDictionary<HistoryPeriod, IntervalsStore<BreakdownT>> histories;
     }
 }