Shared static EventIdPropertyCache cache; Use ConcurrentDictionary as storage.

Author: andrii-babanin-sym

src/Serilog.Extensions.Logging/Extensions/Logging/EventIdPropertyCache.cs

@@ -14,53 +14,46 @@
 
 namespace Serilog.Extensions.Logging
 {
+    using System.Collections.Concurrent;
     using Microsoft.Extensions.Logging;
     using Serilog.Events;
 
-    internal sealed class EventIdPropertyCache
+    static class EventIdPropertyCache
     {
-        private readonly object _createLock = new();
-        private readonly int _maxCapacity;
-        private readonly Dictionary<EventKey, LogEventProperty> _propertyCache;
+        const int MaxCachedProperties = 1024;
 
-        private int count;
+        static readonly ConcurrentDictionary<EventKey, LogEventProperty> s_propertyCache = new();
+        static int s_count;
 
-        public EventIdPropertyCache(int maxCapacity)
-        {
-            _maxCapacity = maxCapacity;
-            _propertyCache = new Dictionary<EventKey, LogEventProperty>(capacity: maxCapacity);
-        }
-
-        public LogEventProperty GetOrCreateProperty(in EventId eventId)
+        public static LogEventProperty GetOrCreateProperty(in EventId eventId)
         {
             var eventKey = new EventKey(eventId);
 
-            if (_propertyCache.TryGetValue(eventKey, out var cachedProperty))
-            {
-                return cachedProperty;
-            }
+            LogEventProperty? property;
 
-            lock (_createLock)
+            if (s_count >= MaxCachedProperties)
             {
-                // Double check under lock
-                if (_propertyCache.TryGetValue(eventKey, out cachedProperty))
+                if (!s_propertyCache.TryGetValue(eventKey, out property))
                 {
-                    return cachedProperty;
+                    property = CreateCore(in eventKey);
                 }
-
-                cachedProperty = CreateCore(in eventKey);
-
-                if (count < _maxCapacity)
-                {
-                    _propertyCache[eventKey] = cachedProperty;
-                    count++;
-                }
-
-                return cachedProperty;
             }
+            else
+            {
+                property = s_propertyCache.GetOrAdd(
+                    eventKey,
+                    static key =>
+                    {
+                        Interlocked.Increment(ref s_count);
+
+                        return CreateCore(in key);
+                    });
+            }
+
+            return property;
         }
 
-        private static LogEventProperty CreateCore(in EventKey eventKey)
+        static LogEventProperty CreateCore(in EventKey eventKey)
         {
             var properties = new List<LogEventProperty>(2);
 
@@ -77,9 +70,8 @@ private static LogEventProperty CreateCore(in EventKey eventKey)
             return new LogEventProperty("EventId", new StructureValue(properties));
         }
 
-        private readonly record struct EventKey
+        readonly record struct EventKey
         {
-            
             public EventKey(EventId eventId)
             {
                 Id = eventId.Id;

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs

@@ -29,9 +29,7 @@ internal static string GetKeyWithoutFirstSymbol(ConcurrentDictionary<string, str
     readonly SerilogLoggerProvider _provider;
     readonly ILogger _logger;
 
-    readonly EventIdPropertyCache _eventPropertyCache = new (48);
-
-    static readonly CachingMessageTemplateParser MessageTemplateParser = new();
+    static readonly CachingMessageTemplateParser MessageTemplateParser = new ();
 
     public SerilogLogger(
         SerilogLoggerProvider provider,
@@ -152,7 +150,7 @@ LogEvent PrepareWrite<TState>(LogEventLevel level, EventId eventId, TState state
         }
 
         if (eventId.Id != 0 || eventId.Name != null)
-            properties.Add(this._eventPropertyCache.GetOrCreateProperty(in eventId));
+            properties.Add(EventIdPropertyCache.GetOrCreateProperty(in eventId));
 
         var (traceId, spanId) = Activity.Current is { } activity ?
             (activity.TraceId, activity.SpanId) :

test/Serilog.Extensions.Logging.Tests/EventIdPropertyCacheTests.cs

@@ -28,12 +28,10 @@ public class EventIdPropertyCacheTests
         public void LowAndHighNumberedEventIdsAreMapped(int id)
         {
             // Arrange
-            var cache = new EventIdPropertyCache(48);
-
             var eventId = new EventId(id, "test");
 
             // Act
-            var mapped = cache.GetOrCreateProperty(eventId);
+            var mapped = EventIdPropertyCache.GetOrCreateProperty(eventId);
 
             // Assert
             var value = Assert.IsType<StructureValue>(mapped.Value);