Excluded global labels from filtration

serilog-contrib · Nov 15, 2020 · c23e782 · c23e782
1 parent 13015f5
commit c23e782
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/src/Serilog.Sinks.Grafana.Loki/LokiBatchFormatter.cs b/src/Serilog.Sinks.Grafana.Loki/LokiBatchFormatter.cs
@@ -155,10 +155,7 @@ public void Format(IEnumerable<string> logEvents, TextWriter output)
 
                 foreach (var label in _globalLabels)
                 {
-                    if (IsAllowedByFilter(label.Key))
-                    {
-                        stream.AddLabel(label.Key, label.Value);
-                    }
+                    stream.AddLabel(label.Key, label.Value);
                 }
 
                 stream.AddEntry(DateTimeOffset.UtcNow, logEvent.TrimEnd('\r', '\n'));
@@ -183,10 +180,7 @@ private void GenerateLabels(LogEvent logEvent, LokiStream stream)
 
             foreach (var label in _globalLabels)
             {
-                if (IsAllowedByFilter(label.Key))
-                {
-                    stream.AddLabel(label.Key, label.Value);
-                }
+                stream.AddLabel(label.Key, label.Value);
             }
 
             foreach (var property in logEvent.Properties)

diff --git a/src/Serilog.Sinks.Grafana.Loki/Serilog.Sinks.Grafana.Loki.csproj b/src/Serilog.Sinks.Grafana.Loki/Serilog.Sinks.Grafana.Loki.csproj
@@ -8,7 +8,7 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <LangVersion>8</LangVersion>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>4.0.1</Version>
+        <Version>4.0.2</Version>
         <!--SourceLink -->
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <RepositoryUrl>https://github.com/mishamyte/serilog-sinks-grafana-loki.git</RepositoryUrl>

diff --git a/test/Serilog.Sinks.Grafana.Loki.Tests/Fixtures/HttpClientTextFixture.cs b/test/Serilog.Sinks.Grafana.Loki.Tests/Fixtures/HttpClientTextFixture.cs
@@ -4,10 +4,6 @@ namespace Serilog.Sinks.Grafana.Loki.Tests.Fixtures
 {
     public class HttpClientTextFixture : IDisposable
     {
-        public HttpClientTextFixture()
-        {
-        }
-
         public void Dispose()
         {
         }

diff --git a/...ki.Tests/HttpClientTests/RequestPayloadTests.GlobalLabelsShouldNotBeFiltered.approved.txt b/...ki.Tests/HttpClientTests/RequestPayloadTests.GlobalLabelsShouldNotBeFiltered.approved.txt
@@ -0,0 +1 @@
+{"streams":[{"stream":{"level":"error","server_ip":"127.0.0.1"},"values":[["<unixepochinnanoseconds>","An error occured"]]}]}
diff --git a/test/Serilog.Sinks.Grafana.Loki.Tests/HttpClientTests/RequestPayloadTests.cs b/test/Serilog.Sinks.Grafana.Loki.Tests/HttpClientTests/RequestPayloadTests.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Serilog.Sinks.Grafana.Loki.Tests.Fixtures;
 using Serilog.Sinks.Grafana.Loki.Tests.Infrastructure;
 using Shouldly;
@@ -93,5 +92,25 @@ public void EntryShouldBeRenderedAccordingToOutputTemplate()
             _client.Content.ShouldMatchApproved(c =>
                 c.WithScrubber(s => Regex.Replace(s, "\"[0-9]{19}\"", "\"<unixepochinnanoseconds>\"")));
         }
+
+        [Fact]
+        public void GlobalLabelsShouldNotBeFiltered()
+        {
+            var logger = new LoggerConfiguration()
+                .WriteTo.GrafanaLoki(
+                    "http://loki:3100",
+                    outputTemplate: OutputTemplate,
+                    filtrationMode: LokiLabelFiltrationMode.Exclude,
+                    filtrationLabels: new[] {"server_ip"},
+                    labels: new[] {new LokiLabel {Key = "server_ip", Value = "127.0.0.1"}},
+                    httpClient: _client)
+                .CreateLogger();
+
+            logger.Error("An error occured");
+            logger.Dispose();
+
+            _client.Content.ShouldMatchApproved(c =>
+                c.WithScrubber(s => Regex.Replace(s, "\"[0-9]{19}\"", "\"<unixepochinnanoseconds>\"")));
+        }
     }
 }
diff --git a/test/Serilog.Sinks.Grafana.Loki.Tests/Serilog.Sinks.Grafana.Loki.Tests.csproj b/test/Serilog.Sinks.Grafana.Loki.Tests/Serilog.Sinks.Grafana.Loki.Tests.csproj
@@ -9,7 +9,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-        <PackageReference Include="Shouldly" Version="4.0.0" />
+        <PackageReference Include="Shouldly" Version="4.0.1" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,10 +4,6 @@ namespace Serilog.Sinks.Grafana.Loki.Tests.Fixtures @@
     {
         public class HttpClientTextFixture : IDisposable
         {
-            public HttpClientTextFixture()
-            {
-            }
             public void Dispose()
             {
             }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"streams":[{"stream":{"level":"error","server_ip":"127.0.0.1"},"values":[["<unixepochinnanoseconds>","An error occured"]]}]}