Fixed several issues with resolving log levels based on settings order and null/empty sources

Author: niemyjski

src/Exceptionless/Extensions/StringExtensions.cs

@@ -33,12 +33,15 @@ public static bool AnyWildcardMatches(this string value, IEnumerable<string> pat
         }
 
         public static bool IsPatternMatch(this string value, string pattern, bool ignoreCase = true) {
-            if (pattern == null || value == null)
-                return false;
+            if (pattern == null)
+                return value == null;
 
             if (pattern.Equals("*"))
                 return true;
 
+            if (value == null)
+                return false;
+
             bool startsWithWildcard = pattern.StartsWith("*");
             if (startsWithWildcard)
                 pattern = pattern.Substring(1);

src/Exceptionless/Models/Collections/SettingsDictionary.cs

@@ -194,7 +194,7 @@ protected override void OnChanged(ChangedEventArgs<KeyValuePair<string, string>>
         private readonly ConcurrentDictionary<string, LogLevel> _minLogLevels = new ConcurrentDictionary<string, LogLevel>(StringComparer.OrdinalIgnoreCase);
 
         public LogLevel GetMinLogLevel(string loggerName) {
-            if (String.IsNullOrEmpty(loggerName))
+            if (loggerName == null)
                 loggerName = "*";
 
             LogLevel minLogLevel;
@@ -237,7 +237,6 @@ private string GetTypeAndSourceSetting(string type, string source, string defaul
             ConcurrentDictionary<string, bool> sourceDictionary;
             string sourcePrefix;
             if (!_typeSourceEnabled.TryGetValue(type, out sourceDictionary)) {
-
                 sourceDictionary = new ConcurrentDictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
                 _typeSourceEnabled.TryAdd(type, sourceDictionary);
                 sourcePrefix = "@@" + type + ":";
@@ -256,6 +255,7 @@ private string GetTypeAndSourceSetting(string type, string source, string defaul
             var sourceSettings = this
                 .Where(kvp => kvp.Key.StartsWith(sourcePrefix))
                 .Select(kvp => new KeyValuePair<string, string>(kvp.Key.Substring(sourcePrefix.Length), kvp.Value))
+                .OrderByDescending(s => s.Key.Length).ThenByDescending(s => s.Key) // sort by most qualified and ensure * comes after a-z.
                 .ToList();
 
             foreach (var kvp in sourceSettings) {

test/Exceptionless.Tests/Exceptionless.Tests.csproj

@@ -35,7 +35,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="Moq" Version="4.14.6" />
+    <PackageReference Include="Moq" Version="4.14.7" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

test/Exceptionless.Tests/Plugins/PluginTests.cs

@@ -152,6 +152,10 @@ public void EventExclusionPlugin_EventExclusions() {
         [InlineData("Test", "Trace", null, null, false)]
         [InlineData("Test", "Off", null, null, true)]
         [InlineData("Test", "Abc", null, null, false)]
+        [InlineData(null, "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix, "Off", false)]
+        [InlineData(null, "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "*", "Off", true)]
+        [InlineData("", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix, "Off", true)] // Becomes Global Log Level
+        [InlineData("", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "*", "Off", true)]
         [InlineData("Test", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "Test", "Debug", true)]
         [InlineData("Test", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "Test", "false", true)]
         [InlineData("Test", "Trace", SettingsDictionary.KnownKeys.LogLevelPrefix + "Test", "no", true)]
@@ -178,6 +182,43 @@ public void EventExclusionPlugin_LogLevels(string source, string level, string s
             Assert.Equal(cancelled, context.Cancel);
         }
 
+        [Fact]
+        public void EventExclusionPlugin_LogLevels_GetMinLogLevel_Settings_Order() {
+            var settings = new SettingsDictionary {{"@@log:", "Info"}, {"@@log:*", "Debug"}};
+            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel(null));
+            Assert.Equal(LogLevel.Info, settings.GetMinLogLevel(String.Empty));
+            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel("*"));
+            
+            settings = new SettingsDictionary {{"@@log:*", "Debug"}, {"@@log:", "Info"}};
+            Assert.Equal(LogLevel.Info, settings.GetMinLogLevel(String.Empty));
+            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel("*"));
+            
+            settings = new SettingsDictionary {
+                { "@@log:*", "Fatal" }, 
+                { "@@log:", "Debug" }, 
+                { "@@log:abc*", "Off" }, 
+                { "@@log:abc.de*", "Debug" }, 
+                { "@@log:abc.def*", "Info" }, 
+                { "@@log:abc.def.ghi", "Trace" }
+            };
+            
+            Assert.Equal(LogLevel.Fatal, settings.GetMinLogLevel(null));
+            Assert.Equal(LogLevel.Debug, settings.GetMinLogLevel(String.Empty));
+            Assert.Equal(LogLevel.Off, settings.GetMinLogLevel("abc"));
+            Assert.Equal(LogLevel.Info, settings.GetMinLogLevel("abc.def"));
+            Assert.Equal(LogLevel.Trace, settings.GetMinLogLevel("abc.def.ghi"));
+            
+            settings = new SettingsDictionary {
+                { "@@log:abc.def.ghi", "Trace" },
+                { "@@log:abc.def*", "Info" }, 
+                { "@@log:abc*", "Off" }
+            };
+            
+            Assert.Equal(LogLevel.Off, settings.GetMinLogLevel("abc"));
+            Assert.Equal(LogLevel.Info, settings.GetMinLogLevel("abc.def"));
+            Assert.Equal(LogLevel.Trace, settings.GetMinLogLevel("abc.def.ghi"));
+        }
+
         [Theory]
         [InlineData(null, null, null, null, false)]
         [InlineData("usage", null, null, null, false)]
@@ -186,6 +227,9 @@ public void EventExclusionPlugin_LogLevels(string source, string level, string s
         [InlineData("usage", "test", "@@usage:Test", "false", true)]
         [InlineData("usage", "EX-FEAT: 1234567890", "@@usage:EX-FEAT: 1234567890", "false", true)]
         [InlineData("usage", "test", "@@usage:*", "false", true)]
+        [InlineData("404", null, "@@404:*", "false", true)]
+        [InlineData("404", null, "@@404:", "false", true)]
+        [InlineData("404", "", "@@404:", "false", true)]
         [InlineData("404", "/unknown", "@@404:*", "false", true)]
         [InlineData("404", "/unknown", "@@404:/unknown", "false", true)]
         [InlineData("404", "/unknown", "@@404:/unknown", "true", false)]
@@ -200,6 +244,7 @@ public void EventExclusionPlugin_SourceType(string type, string source, string s
             var plugin = new EventExclusionPlugin();
             plugin.Run(context);
             Assert.Equal(cancelled, context.Cancel);
+            Assert.Equal(source, ev.Source);
         }
 
         [Theory]