Skip to content

Commit aa9b803

Browse files
LucHeartLucHeart
committed
Merge branch 'master' into develop
2 parents 0864521 + 9f85aac commit aa9b803

6 files changed

Lines changed: 23 additions & 45 deletions

File tree

‎DesktopRepositoryServer/Controllers/RepoController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public RepoController(RepoServerContext db, ApiConfig apiConfig)
2424
_apiConfig = apiConfig;
2525
}
2626

27+
[HttpGet]
2728
public async Task<IActionResult> GetRepo()
2829
{
2930
var moduleRaw = await _db.Modules.Include(x => x.Versions).ToArrayAsync();

‎DesktopRepositoryServer/DesktopRepositoryServer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PackageReference Include="Serilog.AspNetCore" />
3434
<PackageReference Include="Serilog.Sinks.Console" />
3535
<PackageReference Include="Serilog.Sinks.Grafana.Loki" />
36+
<PackageReference Include="Serilog.Sinks.OpenTelemetry" />
3637
</ItemGroup>
3738
<ItemGroup>
3839
<Folder Include="Migrations\" />

‎DesktopRepositoryServer/ExceptionHandler/ExceptionHandler.cs‎

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ namespace OpenShock.Desktop.RepositoryServer.ExceptionHandler;
77
public sealed class OpenShockExceptionHandler : IExceptionHandler
88
{
99
private readonly IProblemDetailsService _problemDetailsService;
10-
private readonly ILogger _logger;
11-
12-
public OpenShockExceptionHandler(IProblemDetailsService problemDetailsService, ILoggerFactory loggerFactory)
10+
private readonly ILogger<OpenShockExceptionHandler> _logger;
11+
12+
public OpenShockExceptionHandler(IProblemDetailsService problemDetailsService, ILogger<OpenShockExceptionHandler> logger)
1313
{
1414
_problemDetailsService = problemDetailsService;
15-
_logger = loggerFactory.CreateLogger("RequestInfo");
15+
_logger = logger;
1616
}
1717

1818
public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception exception, CancellationToken cancellationToken)
1919
{
20+
_logger.LogError(exception, "An unhandled exception occurred while processing the request.");
2021
context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
21-
await PrintRequestInfo(context);
2222

2323
var responseObject = ExceptionError.Exception;
2424
responseObject.AddContext(context);
@@ -30,30 +30,4 @@ public async ValueTask<bool> TryHandleAsync(HttpContext context, Exception excep
3030
ProblemDetails = responseObject
3131
});
3232
}
33-
34-
private async Task PrintRequestInfo(HttpContext context)
35-
{
36-
// Rewind our body reader, so we can read it again.
37-
context.Request.Body.Seek(0, SeekOrigin.Begin);
38-
// Used to read from the body stream.
39-
using var stream = new StreamReader(context.Request.Body);
40-
41-
// Create Dictionaries to be logging in our RequestInfo object for both Header values and Query parameters.
42-
var headers = context.Request.Headers.ToDictionary(x => x.Key, x => x.Value.ToString());
43-
var queryParams = context.Request.Query.ToDictionary(x => x.Key, x => x.Value.ToString());
44-
45-
// Create our RequestInfo object.
46-
var requestInfo = new RequestInfo
47-
{
48-
Body = await stream.ReadToEndAsync(),
49-
Headers = headers,
50-
TraceId = context.TraceIdentifier,
51-
Method = context.Request.Method,
52-
Path = context.Request.Path.Value,
53-
Query = queryParams
54-
};
55-
56-
// Finally log this object on Information level.
57-
_logger.LogInformation("{@RequestInfo}", requestInfo);
58-
}
5933
}

‎DesktopRepositoryServer/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
builder.Services.AddProblemDetails();
9696
builder.Services.TryAddSingleton<TimeProvider>(provider => TimeProvider.System);
9797

98-
builder.Services.AddOpenApi();
98+
builder.Services.AddOpenApi("1");
9999

100100
builder.Services.AddCors(options =>
101101
{
@@ -213,6 +213,6 @@
213213
app.MapOpenApi();
214214
app.MapControllers();
215215

216-
app.MapScalarApiReference();
216+
app.MapScalarApiReference(options => options.AddDocument("1"));
217217

218218
app.Run();

‎DesktopRepositoryServer/appsettings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"Using": [
1818
"Serilog.Sinks.Console",
1919
"Serilog.Sinks.Grafana.Loki",
20+
"Serilog.Sinks.OpenTelemetry",
2021
"OpenShock.Desktop.RepositoryServer"
2122
],
2223
"MinimumLevel": {

‎Directory.Packages.props‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,28 @@
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="10.0.0" />
15-
<PackageVersion Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="10.0.0" />
15+
<PackageVersion Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="10.0.1" />
1616
<PackageVersion Include="FlexLabs.EntityFrameworkCore.Upsert" Version="10.0.0" />
17-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
18-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
19-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
20-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
21-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
22-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
23-
<PackageVersion Include="MiniValidation" Version="0.9.2" />
17+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
18+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.9" />
19+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9" />
20+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.9" />
21+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.9" />
22+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
23+
<PackageVersion Include="MiniValidation" Version="0.10.0" />
2424
<PackageVersion Include="OneOf" Version="3.0.271" />
2525
<PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.11.2-beta.1" />
26-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
26+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
2727
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
2828
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
2929
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
30-
<PackageVersion Include="Scalar.AspNetCore" Version="2.14.9" />
30+
<PackageVersion Include="Scalar.AspNetCore" Version="2.16.3" />
3131
<PackageVersion Include="Semver" Version="3.0.0" />
3232
<PackageVersion Include="Serilog" Version="4.3.1" />
3333
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
3434
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
35-
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="8.3.2" />
36-
<PackageVersion Include="TUnit" Version="1.43.11" />
35+
<PackageVersion Include="Serilog.Sinks.Grafana.Loki" Version="9.0.0" />
36+
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
37+
<PackageVersion Include="TUnit" Version="1.55.2" />
3738
</ItemGroup>
3839
</Project>

0 commit comments

Comments
 (0)