Added logging.
This commit is contained in:
@@ -9,6 +9,10 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
|
||||
<PackageReference Include="Serilog" Version="4.3.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -7,6 +7,9 @@ using JSMR.Infrastructure.Data;
|
||||
using JSMR.Infrastructure.DI;
|
||||
using Microsoft.AspNetCore.Http.Json;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Serilog;
|
||||
using Serilog.Events;
|
||||
using System.Diagnostics;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
@@ -37,6 +40,15 @@ builder.Services.Configure<JsonOptions>(options =>
|
||||
new JsonStringEnumConverter(JsonNamingPolicy.CamelCase)); // or null for exact names
|
||||
});
|
||||
|
||||
// Serilog bootstrap (before Build)
|
||||
Log.Logger = new LoggerConfiguration()
|
||||
.ReadFrom.Configuration(builder.Configuration)
|
||||
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
|
||||
.Enrich.WithProperty("Service", "JSMR.Api")
|
||||
.Enrich.WithProperty("Environment", builder.Environment.EnvironmentName)
|
||||
.CreateLogger();
|
||||
builder.Host.UseSerilog();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
// Configure the HTTP request pipeline.
|
||||
@@ -51,6 +63,25 @@ app.UseAuthorization();
|
||||
|
||||
app.MapControllers();
|
||||
|
||||
// Request logging with latency, status, path
|
||||
app.UseSerilogRequestLogging(opts =>
|
||||
{
|
||||
opts.MessageTemplate = "HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms";
|
||||
});
|
||||
|
||||
// Correlation: ensure every log has traceId and return it to clients
|
||||
app.Use(async (ctx, next) =>
|
||||
{
|
||||
// Use current Activity if present (W3C trace context), else fall back
|
||||
var traceId = Activity.Current?.TraceId.ToString() ?? ctx.TraceIdentifier;
|
||||
using (Serilog.Context.LogContext.PushProperty("TraceId", traceId))
|
||||
{
|
||||
ctx.Response.Headers["x-trace-id"] = traceId;
|
||||
await next();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Health check
|
||||
app.MapGet("/health", () => Results.Ok(new { status = "ok" }));
|
||||
|
||||
@@ -62,9 +93,16 @@ app.MapPost("/api/circles/search", async (
|
||||
SearchCirclesHandler handler,
|
||||
CancellationToken cancallationToken) =>
|
||||
{
|
||||
var result = await handler.HandleAsync(request, cancallationToken);
|
||||
try
|
||||
{
|
||||
SearchCirclesResponse result = await handler.HandleAsync(request, cancallationToken);
|
||||
|
||||
return Results.Ok(result);
|
||||
return Results.Ok(result);
|
||||
}
|
||||
catch (OperationCanceledException) when (cancallationToken.IsCancellationRequested)
|
||||
{
|
||||
return Results.StatusCode(StatusCodes.Status499ClientClosedRequest);
|
||||
}
|
||||
});
|
||||
|
||||
// Voice Works Search
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
"launchBrowser": false,
|
||||
"applicationUrl": "http://localhost:5226",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||
"SEQ_URL": "http://localhost:5341"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
@@ -16,7 +17,8 @@
|
||||
"launchBrowser": false,
|
||||
"applicationUrl": "https://localhost:7277;http://localhost:5226",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||
"SEQ_URL": "http://localhost:5341"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,5 +5,22 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
"AllowedHosts": "*",
|
||||
"Serilog": {
|
||||
"MinimumLevel": {
|
||||
"Default": "Information",
|
||||
"Override": {
|
||||
"Microsoft": "Warning",
|
||||
"System": "Warning"
|
||||
}
|
||||
},
|
||||
"Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ],
|
||||
"WriteTo": [
|
||||
{ "Name": "Console" },
|
||||
{
|
||||
"Name": "Seq",
|
||||
"Args": { "serverUrl": "%SEQ_URL%" }
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user