Skip to content

Commit eaec649

Browse files
committed
Add Loki
1 parent 95870a8 commit eaec649

5 files changed

Lines changed: 111 additions & 7 deletions

File tree

src/.editorconfig

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,73 @@ dotnet_diagnostic.CA2241.severity = error
727727
# IDE0043: 无效的格式字符串
728728
dotnet_diagnostic.IDE0043.severity = none
729729

730+
##########################################
731+
# ReSharper properties
732+
##########################################
733+
734+
#### LoggerMessage ####
735+
dotnet_diagnostic.LOGGEN000.severity = warning
736+
dotnet_diagnostic.LOGGEN001.severity = warning
737+
dotnet_diagnostic.LOGGEN002.severity = warning
738+
dotnet_diagnostic.LOGGEN003.severity = warning
739+
dotnet_diagnostic.LOGGEN004.severity = warning
740+
dotnet_diagnostic.LOGGEN005.severity = warning
741+
dotnet_diagnostic.LOGGEN006.severity = warning
742+
dotnet_diagnostic.LOGGEN007.severity = warning
743+
dotnet_diagnostic.LOGGEN008.severity = warning
744+
dotnet_diagnostic.LOGGEN009.severity = warning
745+
dotnet_diagnostic.LOGGEN010.severity = warning
746+
dotnet_diagnostic.LOGGEN011.severity = warning
747+
dotnet_diagnostic.LOGGEN012.severity = warning
748+
dotnet_diagnostic.LOGGEN013.severity = warning
749+
dotnet_diagnostic.LOGGEN014.severity = warning
750+
dotnet_diagnostic.LOGGEN015.severity = warning
751+
dotnet_diagnostic.LOGGEN016.severity = warning
752+
dotnet_diagnostic.LOGGEN017.severity = warning
753+
dotnet_diagnostic.LOGGEN018.severity = warning
754+
dotnet_diagnostic.LOGGEN019.severity = warning
755+
dotnet_diagnostic.LOGGEN020.severity = warning
756+
dotnet_diagnostic.LOGGEN021.severity = warning
757+
dotnet_diagnostic.LOGGEN022.severity = warning
758+
dotnet_diagnostic.LOGGEN023.severity = warning
759+
dotnet_diagnostic.LOGGEN024.severity = warning
760+
dotnet_diagnostic.LOGGEN025.severity = warning
761+
dotnet_diagnostic.LOGGEN026.severity = warning
762+
dotnet_diagnostic.LOGGEN027.severity = warning
763+
dotnet_diagnostic.LOGGEN028.severity = warning
764+
dotnet_diagnostic.LOGGEN029.severity = warning
765+
dotnet_diagnostic.LOGGEN030.severity = warning
766+
dotnet_diagnostic.LOGGEN031.severity = warning
767+
dotnet_diagnostic.LOGGEN032.severity = warning
768+
dotnet_diagnostic.LOGGEN033.severity = warning
769+
dotnet_diagnostic.LOGGEN034.severity = warning
770+
dotnet_diagnostic.LOGGEN035.severity = warning
771+
dotnet_diagnostic.LOGGEN036.severity = warning
772+
dotnet_diagnostic.LOGGEN037.severity = warning
773+
dotnet_diagnostic.LOGGEN038.severity = warning
774+
775+
#### Metrics ####
776+
dotnet_diagnostic.METGEN000.severity = warning
777+
dotnet_diagnostic.METGEN001.severity = warning
778+
dotnet_diagnostic.METGEN002.severity = warning
779+
dotnet_diagnostic.METGEN003.severity = warning
780+
dotnet_diagnostic.METGEN004.severity = warning
781+
dotnet_diagnostic.METGEN005.severity = warning
782+
dotnet_diagnostic.METGEN006.severity = warning
783+
dotnet_diagnostic.METGEN007.severity = warning
784+
dotnet_diagnostic.METGEN008.severity = warning
785+
dotnet_diagnostic.METGEN009.severity = warning
786+
dotnet_diagnostic.METGEN010.severity = warning
787+
dotnet_diagnostic.METGEN011.severity = warning
788+
dotnet_diagnostic.METGEN012.severity = warning
789+
dotnet_diagnostic.METGEN013.severity = warning
790+
dotnet_diagnostic.METGEN014.severity = warning
791+
dotnet_diagnostic.METGEN015.severity = warning
792+
dotnet_diagnostic.METGEN016.severity = warning
793+
dotnet_diagnostic.METGEN017.severity = warning
794+
dotnet_diagnostic.METGEN018.severity = warning
795+
dotnet_diagnostic.METGEN019.severity = warning
796+
730797
##########################################
731798
# CodeRush
732799
##########################################

src/plugins/SerilogTest/Controllers/LoggerMessageTestController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public IActionResult DestructObject()
4242
Summary = "summary"
4343
};
4444

45-
_logger.LogInformation("UseLogContext {@Data}", data);
45+
LogDestructObject(data);
4646

4747
return Ok(data);
4848
}
@@ -93,7 +93,7 @@ public IActionResult LoggerScope()
9393
public partial void LogErrorMessage(Exception ex);
9494

9595
[NonAction]
96-
[LoggerMessage(300, LogLevel.Information, "@{Data}")]
96+
[LoggerMessage(300, LogLevel.Information, "{@Data}")]
9797
public partial void LogDestructObject(WeatherForecast data);
9898

9999
#endregion

src/plugins/SerilogTest/Program.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Serilog.Exceptions;
55
using Serilog.Exceptions.Core;
66
using Serilog.Exceptions.EntityFrameworkCore.Destructurers;
7-
using Serilog.Sinks.Grafana.Loki;
87

98
namespace SerilogTest;
109

@@ -132,9 +131,7 @@ static LoggerConfiguration ConfigureLogger(LoggerConfiguration configuration)
132131
.WithExceptionDetails(
133132
new DestructuringOptionsBuilder().WithDefaultDestructurers()
134133
.WithIgnoreStackTraceAndTargetSiteExceptionFilter()
135-
.WithDestructurers([new DbUpdateExceptionDestructurer()]))
136-
.WriteTo
137-
.GrafanaLoki("http://localhost:3100");
134+
.WithDestructurers([new DbUpdateExceptionDestructurer()]));
138135
}
139136
}
140137

src/plugins/SerilogTest/WeatherForecast.cs

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace SerilogTest;
22

3-
public class WeatherForecast
3+
public class WeatherForecast : A
44
{
55

66
#region Properties
@@ -17,6 +17,30 @@ public class WeatherForecast
1717

1818
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
1919

20+
public override string TypeName { get; } = nameof(WeatherForecast);
21+
2022
#endregion
2123

2224
}
25+
26+
public abstract class A
27+
{
28+
29+
#region Properties
30+
31+
public long Id { get; protected set; }
32+
33+
public abstract string TypeName { get; }
34+
35+
#endregion
36+
37+
#region Methods
38+
39+
public override string ToString()
40+
{
41+
return $"{TypeName} Id:{Id}";
42+
}
43+
44+
#endregion
45+
46+
}

src/plugins/SerilogTest/appsettings.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,22 @@
5555
}
5656
]
5757
}
58+
},
59+
{
60+
"Name": "GrafanaLoki",
61+
"Args": {
62+
"uri": "http://localhost:3100",
63+
"period": "00:00:05",
64+
"labels": [
65+
{
66+
"key": "service_name",
67+
"value": "SerilogTest"
68+
}
69+
],
70+
"propertiesAsLabels": [
71+
"EnvironmentName"
72+
]
73+
}
5874
}
5975
]
6076
},

0 commit comments

Comments
 (0)