Skip to content

Commit dc574a2

Browse files
TsingisTsingis
committed
Change serilog setup
1 parent e617c22 commit dc574a2

File tree

6 files changed

+64
-26
lines changed

6 files changed

+64
-26
lines changed

‎src/Api/Api.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<PackageReference Include="Microsoft.Extensions.Logging.ApplicationInsights" />
1515
<PackageReference Include="Scalar.AspNetCore" />
1616
<PackageReference Include="Serilog" />
17+
<PackageReference Include="Serilog.Exceptions" />
1718
<PackageReference Include="Serilog.Extensions.Hosting" />
1819
<PackageReference Include="Serilog.Settings.Configuration" />
1920
<PackageReference Include="Serilog.Sinks.ApplicationInsights" />

‎src/Api/Program.cs‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using Api.Setup;
44
using Azure.Identity;
55
using Common;
6+
using Microsoft.ApplicationInsights.Extensibility;
67
using Serilog;
8+
using Serilog.Exceptions;
79

810
DotNetEnv.Env.TraversePath().Load();
911

@@ -31,16 +33,32 @@
3133
{
3234
var keyVaultUri = new Uri($"https://{keyVaultName}.vault.azure.net/");
3335
builder.Configuration.AddAzureKeyVault(keyVaultUri, new DefaultAzureCredential());
34-
35-
Log.Logger = new LoggerConfiguration()
36-
.ReadFrom.Configuration(builder.Configuration)
37-
.WriteTo.Console(outputTemplate: logFormat, formatProvider: CultureInfo.InvariantCulture)
38-
.WriteTo.ApplicationInsights(builder.Configuration["ApplicationInsights:ConnectionString"], TelemetryConverter.Traces)
39-
.CreateLogger();
4036
}
4137

4238
builder.Services.ConfigureServices();
4339

40+
builder.Host.UseSerilog((ctx, services, loggerConfig) =>
41+
{
42+
loggerConfig
43+
.ReadFrom.Configuration(ctx.Configuration)
44+
.Enrich.FromLogContext()
45+
.Enrich.WithExceptionDetails()
46+
.WriteTo.Console(outputTemplate: logFormat, formatProvider: CultureInfo.InvariantCulture);
47+
48+
if (ctx.HostingEnvironment.IsProduction())
49+
{
50+
var tc = new TelemetryConfiguration
51+
{
52+
ConnectionString = ctx.Configuration["ApplicationInsights:ConnectionString"]
53+
};
54+
loggerConfig.WriteTo.ApplicationInsights(tc, TelemetryConverter.Traces);
55+
}
56+
},
57+
writeToProviders: false,
58+
preserveStaticLogger: false
59+
);
60+
61+
4462
var app = builder.Build();
4563

4664
app.MapEndpoints();

‎src/Api/packages.lock.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,16 @@
107107
"resolved": "4.3.0",
108108
"contentHash": "+cDryFR0GRhsGOnZSKwaDzRRl4MupvJ42FhCE4zhQRVanX0Jpg6WuCBk59OVhVDPmab1bB+nRykAnykYELA9qQ=="
109109
},
110+
"Serilog.Exceptions": {
111+
"type": "Direct",
112+
"requested": "[8.4.0, )",
113+
"resolved": "8.4.0",
114+
"contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==",
115+
"dependencies": {
116+
"Serilog": "2.8.0",
117+
"System.Reflection.TypeExtensions": "4.7.0"
118+
}
119+
},
110120
"Serilog.Extensions.Hosting": {
111121
"type": "Direct",
112122
"requested": "[9.0.0, )",
@@ -1208,12 +1218,8 @@
12081218
},
12091219
"System.Reflection.TypeExtensions": {
12101220
"type": "Transitive",
1211-
"resolved": "4.3.0",
1212-
"contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
1213-
"dependencies": {
1214-
"System.Reflection": "4.3.0",
1215-
"System.Runtime": "4.3.0"
1216-
}
1221+
"resolved": "4.7.0",
1222+
"contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA=="
12171223
},
12181224
"System.Resources.ResourceManager": {
12191225
"type": "Transitive",

‎src/Directory.Packages.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.23.0" />
1818
<PackageVersion Include="Scalar.AspNetCore" Version="2.8.0" />
1919
<PackageVersion Include="Serilog" Version="4.3.0" />
20+
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
2021
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
2122
<PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
2223
<PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
2324
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
24-
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.15.0.120848"/>
25+
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" />
2526
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4" />
2627
</ItemGroup>
27-
</Project>
28+
</Project>

‎tests/ArchitectureTests/packages.lock.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -823,6 +823,15 @@
823823
"resolved": "4.3.0",
824824
"contentHash": "+cDryFR0GRhsGOnZSKwaDzRRl4MupvJ42FhCE4zhQRVanX0Jpg6WuCBk59OVhVDPmab1bB+nRykAnykYELA9qQ=="
825825
},
826+
"Serilog.Exceptions": {
827+
"type": "Transitive",
828+
"resolved": "8.4.0",
829+
"contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==",
830+
"dependencies": {
831+
"Serilog": "2.8.0",
832+
"System.Reflection.TypeExtensions": "4.7.0"
833+
}
834+
},
826835
"Serilog.Extensions.Hosting": {
827836
"type": "Transitive",
828837
"resolved": "9.0.0",
@@ -1333,12 +1342,8 @@
13331342
},
13341343
"System.Reflection.TypeExtensions": {
13351344
"type": "Transitive",
1336-
"resolved": "4.3.0",
1337-
"contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
1338-
"dependencies": {
1339-
"System.Reflection": "4.3.0",
1340-
"System.Runtime": "4.3.0"
1341-
}
1345+
"resolved": "4.7.0",
1346+
"contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA=="
13421347
},
13431348
"System.Resources.ResourceManager": {
13441349
"type": "Transitive",
@@ -1784,6 +1789,7 @@
17841789
"Microsoft.Extensions.Logging.ApplicationInsights": "[2.23.0, )",
17851790
"Scalar.AspNetCore": "[2.8.0, )",
17861791
"Serilog": "[4.3.0, )",
1792+
"Serilog.Exceptions": "[8.4.0, )",
17871793
"Serilog.Extensions.Hosting": "[9.0.0, )",
17881794
"Serilog.Settings.Configuration": "[9.0.0, )",
17891795
"Serilog.Sinks.ApplicationInsights": "[4.0.0, )",

‎tests/IntegrationTests/packages.lock.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,15 @@
10141014
"resolved": "4.3.0",
10151015
"contentHash": "+cDryFR0GRhsGOnZSKwaDzRRl4MupvJ42FhCE4zhQRVanX0Jpg6WuCBk59OVhVDPmab1bB+nRykAnykYELA9qQ=="
10161016
},
1017+
"Serilog.Exceptions": {
1018+
"type": "Transitive",
1019+
"resolved": "8.4.0",
1020+
"contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==",
1021+
"dependencies": {
1022+
"Serilog": "2.8.0",
1023+
"System.Reflection.TypeExtensions": "4.7.0"
1024+
}
1025+
},
10171026
"Serilog.Extensions.Hosting": {
10181027
"type": "Transitive",
10191028
"resolved": "9.0.0",
@@ -1555,12 +1564,8 @@
15551564
},
15561565
"System.Reflection.TypeExtensions": {
15571566
"type": "Transitive",
1558-
"resolved": "4.3.0",
1559-
"contentHash": "7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
1560-
"dependencies": {
1561-
"System.Reflection": "4.3.0",
1562-
"System.Runtime": "4.3.0"
1563-
}
1567+
"resolved": "4.7.0",
1568+
"contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA=="
15641569
},
15651570
"System.Resources.ResourceManager": {
15661571
"type": "Transitive",
@@ -2006,6 +2011,7 @@
20062011
"Microsoft.Extensions.Logging.ApplicationInsights": "[2.23.0, )",
20072012
"Scalar.AspNetCore": "[2.8.0, )",
20082013
"Serilog": "[4.3.0, )",
2014+
"Serilog.Exceptions": "[8.4.0, )",
20092015
"Serilog.Extensions.Hosting": "[9.0.0, )",
20102016
"Serilog.Settings.Configuration": "[9.0.0, )",
20112017
"Serilog.Sinks.ApplicationInsights": "[4.0.0, )",

0 commit comments

Comments
 (0)