Fixed StackTrace replacement in tests

serilog-contrib · Apr 8, 2021 · a2d8c38 · a2d8c38
1 parent b6d71f2
commit a2d8c38
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...als/LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly.approved.txt b/...als/LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly.approved.txt
@@ -1 +1 @@
-{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.AggregateException\u0022,\u0022Message\u0022:\u0022AggregateException (Exception 0) (Exception 1) (Exception 2) (Exception 3) (Exception 4)\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 167\u0022,\u0022InnerExceptions\u0022:[{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception 0\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 159\u0022},{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception 1\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 159\u0022},{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception 2\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 159\u0022},{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception 3\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 159\u0022},{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception 4\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.AggregateExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 159\u0022},]}}"]]}]}
+{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.AggregateException\u0022,\u0022Message\u0022:\u0022AggregateException (Exception 0) (Exception 1) (Exception 2) (Exception 3) (Exception 4)\u0022,\u0022StackTrace<stack-trace>}}"]]}]}
diff --git a/...tFormatterTests.MessagePropertyForExceptionsWithoutMessageShouldNotBeCreated.approved.txt b/...tFormatterTests.MessagePropertyForExceptionsWithoutMessageShouldNotBeCreated.approved.txt
@@ -1 +1 @@
-{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.MessagePropertyForExceptionsWithoutMessageShouldNotBeCreated() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 116\u0022}}"]]}]}
+{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022StackTrace<stack-trace>}}"]]}]}
diff --git a/...rovals/LokiJsonTextFormatterTests.SimpleExceptionShouldBeSerializedCorrectly.approved.txt b/...rovals/LokiJsonTextFormatterTests.SimpleExceptionShouldBeSerializedCorrectly.approved.txt
@@ -1 +1 @@
-{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception message\u0022,\u0022StackTrace\u0022:\u0022   at Serilog.Sinks.Grafana.Loki.Tests.FormatterTests.LokiJsonTextFormatterTests.SimpleExceptionShouldBeSerializedCorrectly() in <path>\\\\Serilog.Sinks.Grafana.Loki\\\\test\\\\Serilog.Sinks.Grafana.Loki.Tests\\\\FormatterTests\\\\LokiJsonTextFormatterTests.cs:line 79\u0022}}"]]}]}
+{"streams":[{"stream":{},"values":[["<unixepochinnanoseconds>","{\u0022Message\u0022:\u0022An error occured\u0022,\u0022MessageTemplate\u0022:\u0022An error occured\u0022,\u0022level\u0022:\u0022error\u0022,\u0022Exception\u0022:{\u0022Type\u0022:\u0022System.Exception\u0022,\u0022Message\u0022:\u0022Exception message\u0022,\u0022StackTrace<stack-trace>}}"]]}]}
diff --git a/test/Serilog.Sinks.Grafana.Loki.Tests/FormatterTests/LokiJsonTextFormatterTests.cs b/test/Serilog.Sinks.Grafana.Loki.Tests/FormatterTests/LokiJsonTextFormatterTests.cs
@@ -94,8 +94,8 @@ public void SimpleExceptionShouldBeSerializedCorrectly()
                         .Replace(s, "\"[0-9]{19}\"", "\"<unixepochinnanoseconds>\"");
                     return Regex.Replace(
                         s,
-                        @"(?<=SimpleExceptionShouldBeSerializedCorrectly\(\) in )(.*?)(?=Serilog.Sinks.Grafana.Loki)",
-                        @"<path>\\\\");
+                        @"(?<=\\u0022StackTrace)(.*?)(?=}})",
+                        @"<stack-trace>");
                 });
             });
         }
@@ -131,8 +131,8 @@ public void MessagePropertyForExceptionsWithoutMessageShouldNotBeCreated()
                         .Replace(s, "\"[0-9]{19}\"", "\"<unixepochinnanoseconds>\"");
                     return Regex.Replace(
                         s,
-                        @"(?<=MessagePropertyForExceptionsWithoutMessageShouldNotBeCreated\(\) in )(.*?)(?=Serilog.Sinks.Grafana.Loki)",
-                        @"<path>\\\\");
+                        @"(?<=\\u0022StackTrace)(.*?)(?=}})",
+                        @"<stack-trace>");
                 });
             });
         }
@@ -182,8 +182,8 @@ public void AggregateExceptionShouldBeSerializedCorrectly()
                         .Replace(s, "\"[0-9]{19}\"", "\"<unixepochinnanoseconds>\"");
                     return Regex.Replace(
                         s,
-                        @"(?<=AggregateExceptionShouldBeSerializedCorrectly\(\) in )(.*?)(?=Serilog.Sinks.Grafana.Loki)",
-                        @"<path>\\\\");
+                        @"(?<=\\u0022StackTrace)(.*?)(?=}})",
+                        @"<stack-trace>");
                 });
             });
         }