Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

chore(deps): update non-major nuget dependencies #547

Merged
merged 2 commits into from
Oct 10, 2023
Merged

chore(deps): update non-major nuget dependencies #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9043f4
chore(deps): update non-major nuget dependencies
renovate[bot] Oct 10, 2023
813d065
fix: removed custom instrumentation configuration
ThorstenSauter Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AspNetCore.HealthChecks.SqlServer" Version="7.0.0"/>
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0-beta.7"/>
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0-beta.8"/>
<PackageVersion Include="Bogus" Version="34.0.2"/>
<PackageVersion Include="coverlet.collector" Version="6.0.0"/>
<PackageVersion Include="FastEndpoints" Version="5.18.0"/>
<PackageVersion Include="FastEndpoints.Generator" Version="5.18.0"/>
<PackageVersion Include="FastEndpoints.Swagger" Version="5.18.0"/>
<PackageVersion Include="FluentAssertions" Version="6.12.0"/>
<PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.1.23421.29"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-rc.1.23419.4"/>
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.1.23419.4"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-rc.2.23480.2"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.2.23480.1"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-rc.2.23479.6"/>
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0-rc.2.23479.6"/>
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.56.0"/>
<PackageVersion Include="Microsoft.Identity.Web" Version="2.15.1"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
Expand All @@ -32,7 +32,7 @@
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.11.0.78383"/>
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.507"/>
<PackageVersion Include="Testcontainers.MsSql" Version="3.5.0"/>
<PackageVersion Include="Verify.Xunit" Version="22.1.1"/>
<PackageVersion Include="Verify.Xunit" Version="22.1.3"/>
<PackageVersion Include="xunit" Version="2.5.1"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1"/>
</ItemGroup>
Expand Down
23 changes: 0 additions & 23 deletions src/NoPlan.Infrastructure/Observability/WebApplicationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Identity.Web;
using OpenTelemetry.Instrumentation.AspNetCore;
using OpenTelemetry.Instrumentation.Http;
using OpenTelemetry.Instrumentation.SqlClient;
using OpenTelemetry.Logs;
using OpenTelemetry.Metrics;
using OpenTelemetry.Resources;
Expand All @@ -24,31 +20,12 @@ internal static WebApplicationBuilder AddOpenTelemetry(this WebApplicationBuilde

webApplicationBuilder.Services.AddOpenTelemetry().UseAzureMonitor(options => options.Credential = new DefaultAzureCredential());
webApplicationBuilder.Services
.ConfigureInstrumentation()
.ConfigureMetrics(isDevelopment)
.ConfigureTracing(isDevelopment);

return webApplicationBuilder.ConfigureLogging(isDevelopment);
}

private static IServiceCollection ConfigureInstrumentation(this IServiceCollection services) =>
services
.Configure<AspNetCoreInstrumentationOptions>(options =>
{
options.RecordException = true;
options.EnrichWithHttpRequest = (activity, request) =>
{
activity.SetTag("http.client_ip", request.HttpContext.Connection.RemoteIpAddress);
activity.SetTag("enduser.id", request.HttpContext.User.GetObjectId());
};
})
.Configure<HttpClientInstrumentationOptions>(options => options.RecordException = true)
.Configure<SqlClientInstrumentationOptions>(options =>
{
options.RecordException = true;
options.SetDbStatementForText = true;
});

private static IServiceCollection ConfigureTracing(this IServiceCollection services, bool isDevelopment)
{
var resourceAttributes = new Dictionary<string, object>
Expand Down