updated API

josephwoodward · Oct 5, 2020 · c7eaa52 · c7eaa52
1 parent 01e980f
commit c7eaa52
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/Serilog.Sinks.Loki.Example/LogLabelProvider.cs b/src/Serilog.Sinks.Loki.Example/LogLabelProvider.cs
@@ -14,6 +14,9 @@ public IList<LokiLabel> GetLabels()
             };
         }
 
-        public bool PropertiesAsLabels { get; set; } = false;
+        public IList<string> PropertiesAsLabels { get; set; } = new List<string>
+        {
+            "MyPropertyName"
+        };
     }
 }
diff --git a/src/Serilog.Sinks.Loki/Labels/DefaultLogLabelProvider.cs b/src/Serilog.Sinks.Loki/Labels/DefaultLogLabelProvider.cs
@@ -9,6 +9,6 @@ public IList<LokiLabel> GetLabels()
             return new List<LokiLabel>();
         }
 
-        public bool PropertiesAsLabels { get; set; } = true;
+        public IList<string> PropertiesAsLabels { get; set; } = new List<string>();
     }
 }
diff --git a/src/Serilog.Sinks.Loki/Labels/ILogLabelProvider.cs b/src/Serilog.Sinks.Loki/Labels/ILogLabelProvider.cs
@@ -5,6 +5,6 @@ namespace Serilog.Sinks.Loki.Labels
     public interface ILogLabelProvider
     {
         IList<LokiLabel> GetLabels();
-        bool PropertiesAsLabels { get; set; }
+        IList<string> PropertiesAsLabels { get; set; }
     }
 }
diff --git a/src/Serilog.Sinks.Loki/LokiBatchFormatter.cs b/src/Serilog.Sinks.Loki/LokiBatchFormatter.cs
@@ -14,7 +14,7 @@ namespace Serilog.Sinks.Loki
     internal class LokiBatchFormatter : IBatchFormatter 
     {
         private readonly IList<LokiLabel> _globalLabels;
-        private readonly bool _propertiesAsLabels;
+        private readonly IList<string> _propertiesAsLabels;
 
         public LokiBatchFormatter()
         {
@@ -71,7 +71,7 @@ public void Format(IEnumerable<LogEvent> logEvents, ITextFormatter formatter, Te
                     // We also remove any \r\n newlines and replace with \n new lines to prevent "bad request" responses
                     // We also remove backslashes and replace with forward slashes, Loki doesn't like those either
                     var propertyValue = property.Value.ToString().Replace("\"", "").Replace("\r\n", "\n").Replace("\\", "/");
-                    if (_propertiesAsLabels)
+                    if (_propertiesAsLabels.Contains(property.Key, StringComparer.OrdinalIgnoreCase))
                     {
                         stream.Labels.Add(new LokiLabel(property.Key, propertyValue));
                     }

diff --git a/test/Serilog.Sinks.Loki.Tests/Infrastructure/TestLabelProvider.cs b/test/Serilog.Sinks.Loki.Tests/Infrastructure/TestLabelProvider.cs
@@ -13,6 +13,6 @@ public IList<LokiLabel> GetLabels()
             };
         }
 
-        public bool PropertiesAsLabels { get; set; } = false;
+        public IList<string> PropertiesAsLabels { get; set; } = new List<string>();
     }
 }