Compare commits

...
Sign in to create a new pull request.

10 commits

Author SHA1 Message Date
Laura Hausmann
9af12bddc9
a 2024-07-26 23:35:54 +02:00
Laura Hausmann
042f736d71
Revert "a"
This reverts commit 8f24ee5e27570043a28a03114458864c177bc828.
2024-07-26 23:35:54 +02:00
Laura Hausmann
44f6404ecf
a 2024-07-26 23:35:53 +02:00
Laura Hausmann
fc9c9e3512
a 2024-07-26 23:35:53 +02:00
Laura Hausmann
b63a3298c1
aaaaa 2024-07-26 23:35:53 +02:00
Laura Hausmann
defcdf8bdc
a 2024-07-26 23:35:53 +02:00
Laura Hausmann
68804ec3cc
wha 2024-07-26 23:35:53 +02:00
Laura Hausmann
223e927055
a 2024-07-26 23:35:53 +02:00
Laura Hausmann
c106bb2d39
eh 2024-07-26 23:35:53 +02:00
Laura Hausmann
23355f985b
wip: otlp 2024-07-26 23:35:53 +02:00
2 changed files with 20 additions and 1 deletions

View file

@ -36,6 +36,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6-iceshrimp" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6-iceshrimp" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />

View file

@ -2,6 +2,11 @@ using Iceshrimp.Backend.Core.Extensions;
using Iceshrimp.Backend.Core.Helpers; using Iceshrimp.Backend.Core.Helpers;
using Iceshrimp.Backend.SignalR; using Iceshrimp.Backend.SignalR;
using Iceshrimp.Backend.SignalR.Authentication; using Iceshrimp.Backend.SignalR.Authentication;
using OpenTelemetry;
using OpenTelemetry.Exporter;
using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
using OpenTelemetry.Trace;
StartupHelpers.ParseCliArguments(args); StartupHelpers.ParseCliArguments(args);
@ -31,9 +36,20 @@ builder.Services.AddAuthenticationServices();
builder.Services.AddSignalR().AddMessagePackProtocol(); builder.Services.AddSignalR().AddMessagePackProtocol();
builder.Services.AddResponseCompression(); builder.Services.AddResponseCompression();
builder.Services.AddRazorPages(); builder.Services.AddRazorPages();
builder.Services.AddServices(); builder.Services.AddServices();
builder.Services.ConfigureServices(builder.Configuration); builder.Services.ConfigureServices(builder.Configuration);
builder.Services.AddOpenTelemetry()
.UseOtlpExporter()
.WithTracing(p => p.AddAspNetCoreInstrumentation())
.WithMetrics(p => p.AddAspNetCoreInstrumentation())
.WithLogging(null, p =>
{
p.IncludeScopes = true;
p.ParseStateValues = true;
p.IncludeFormattedMessage = true;
});
builder.WebHost.ConfigureKestrel(builder.Configuration); builder.WebHost.ConfigureKestrel(builder.Configuration);
builder.WebHost.UseStaticWebAssets(); builder.WebHost.UseStaticWebAssets();