Merge pull request #3 from jrsearles/feat/simplify-log-models

feat: simplify logging model

src/Elmah.AspNetCore/ErrorWrapper.cs

@@ -312,25 +312,24 @@ public string? Client
     public string? Version => _error.ServerVariables["Version"];
 
     [XmlIgnore]
-    public List<IElmahLogMessage> MessageLog
+    public List<ErrorLogMessageWrapper> MessageLog
     {
         get => GetMessageLog();
         // ReSharper disable once ValueParameterNotUsed
         set { }
     }
 
-    private List<IElmahLogMessage> GetMessageLog()
+    private List<ErrorLogMessageWrapper> GetMessageLog()
     {
-        var result = _error.MessageLog.ToList();
+        var result = _error.MessageLog.Select(x => new ErrorLogMessageWrapper(x)).ToList();
         foreach (var param in _error.Params)
         {
-            result.Add(new XmlLogMessage
+            result.Add(new ErrorLogMessageWrapper(new XmlLogMessage
             {
                 TimeStamp = param.TimeStamp,
                 Level = LogLevel.Information,
-                Message = $"Method {param.TypeName}.{param.MemberName} call with parameters:",
-                Params = param.Params
-            });
+                Message = $"Method {param.TypeName}.{param.MemberName} call with parameters:"
+            }, param.Params));
         }
 
         return result.OrderBy(i => i.TimeStamp).ToList();
@@ -452,4 +451,31 @@ public List<ElmahLogParamEntry> Params
         // ReSharper disable once ValueParameterNotUsed
         set { }
     }
+
+    internal sealed class ErrorLogMessageWrapper
+    {
+        private readonly IElmahLogMessage _message;
+        private readonly KeyValuePair<string, string>[]? _parameters;
+
+        public ErrorLogMessageWrapper(IElmahLogMessage message, KeyValuePair<string, string>[]? parameters = null)
+        {
+            _message = message;
+            _parameters = parameters;
+        }
+
+        public DateTime TimeStamp => _message.TimeStamp;
+
+        public string? Exception => _message.Exception;
+
+        public string? Scope => _message.Scope;
+
+        public LogLevel? Level => _message.Level;
+
+        public string? Message => _message.Render();
+
+        public KeyValuePair<string, string>[]? Params => _parameters;
+
+        // This property is used on client side only - passing it down as initial state
+        public bool Collapsed => true;
+    }
 }

src/Elmah.AspNetCore/Handlers/ErrorResourceHandler.cs

@@ -16,7 +16,7 @@ namespace Elmah.AspNetCore.Handlers;
 internal static partial class Endpoints
 {
     private static readonly HashSet<string> ResourceNames =
-        new(typeof(Endpoints).GetTypeInfo().Assembly.GetManifestResourceNames(), StringComparer.OrdinalIgnoreCase);
+        new(typeof(Endpoints).Assembly.GetManifestResourceNames(), StringComparer.OrdinalIgnoreCase);
 
     private static readonly Assembly ThisAssembly = typeof(Endpoints).Assembly;
     private static readonly string ResourcePrefix = $"{ThisAssembly.GetName().Name}.wwwroot.";

src/Elmah.AspNetCore/Logger/ElmahLogger.cs

@@ -41,7 +41,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
         }
 
         var feature = _accessor.HttpContext!.Features.Get<IElmahLogFeature>()!;
-        var entry = new ElmahLogMessageEntry<TState>
+        var entry = new ElmahLoggerMessage<TState>
         {
             TimeStamp = DateTime.Now,
             State = state,

src/Elmah.Common/ElmahLogMessageEntry.cs → src/Elmah.AspNetCore/Logger/ElmahLoggerMessage.cs

@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
-namespace Elmah;
+namespace Elmah.AspNetCore.Logger;
 
-public sealed class ElmahLogMessageEntry<TState> : IElmahLogMessage
+internal sealed class ElmahLoggerMessage<TState> : IElmahLogMessage
 {
     public DateTime TimeStamp { get; init; }
     public string? Scope { get; init; }

src/Elmah.Common/IElmahLogMessage.cs

@@ -10,8 +10,5 @@ public interface IElmahLogMessage
     string? Exception { get; }
     string? Scope { get; }
     LogLevel? Level { get; }
-    string? Message => this.Render();
     string? Render();
-    KeyValuePair<string, string>[]? Params => null;
-    bool Collapsed => true;
 }

src/Elmah.Common/Xml/ErrorXml.cs

@@ -369,7 +369,7 @@ private static void WriteMessageLog(XmlWriter writer, string name, IEnumerable<I
             WriteXmlAttribute(writer, "time-stamp",
                 XmlConvert.ToString(entry.TimeStamp.ToUniversalTime(), @"yyyy-MM-dd\THH:mm:ss.fffffff\Z"));
             WriteXmlAttribute(writer, "scope", entry.Scope);
-            WriteXmlAttribute(writer, "message", entry.Message);
+            WriteXmlAttribute(writer, "message", entry.Render());
             writer.WriteEndElement();
         }
 

src/Elmah.Common/XmlLogMessage.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 
 namespace Elmah;
@@ -16,7 +15,5 @@ public sealed class XmlLogMessage : IElmahLogMessage
 
     public string? Message { get; set; }
 
-    public KeyValuePair<string, string>[] Params { get; set; } = Array.Empty<KeyValuePair<string, string>>();
-
     public string? Render() => this.Message;
 }