Skip to content

Commit 3655fc6

Browse files
ejsmithejsmith
committed
Merge branch 'main' into aspire9
2 parents 4892f5f + bff07e9 commit 3655fc6

33 files changed

+219
-180
lines changed

‎src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
<PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
2929
<PackageReference Include="Handlebars.Net" Version="2.1.6" />
3030
<PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0-rc.2.24473.5" />
32-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24474.3" />
33-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24473.5" />
34-
<PackageReference Include="Stripe.net" Version="46.2.1" />
35-
<PackageReference Include="System.DirectoryServices" Version="9.0.0-rc.2.24473.5" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
34+
<PackageReference Include="Stripe.net" Version="47.0.0" />
35+
<PackageReference Include="System.DirectoryServices" Version="9.0.0" />
3636
<PackageReference Include="UAParser" Version="3.1.47" />
3737
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.12" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
3838
<ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
3939
</ItemGroup>
4040

4141
<ItemGroup Label="Transitive dependency updates to resolve vulnerability warnings">
42-
<PackageReference Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
42+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
4343
</ItemGroup>
4444
</Project>

‎src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
<PackageReference Include="Foundatio.Minio" Version="11.0.5" />
99
<PackageReference Include="Foundatio.RabbitMQ" Version="11.0.5" />
1010
<PackageReference Include="Foundatio.Redis" Version="11.0.5" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0-rc.2.24473.5" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24473.5" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24473.5" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.2.24473.5" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-rc.2.24473.5" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0-rc.2.24473.5" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
1717
<PackageReference Include="MailKit" Version="4.8.0" />
1818
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
1919
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
2020
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
2121
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
2222
<PackageReference Include="Serilog.Sinks.ExceptionLess" Version="5.0.0" />
23-
<PackageReference Include="YamlDotNet" Version="16.1.3" />
23+
<PackageReference Include="YamlDotNet" Version="16.2.0" />
2424
</ItemGroup>
2525
<ItemGroup Label="Transitive dependency updates to resolve vulnerability warnings">
2626
<PackageReference Include="System.Net.Http" Version="4.3.4" />

‎src/Exceptionless.Job/Exceptionless.Job.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
<ItemGroup>
77
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.4" />
8-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0-rc.2.24474.3" />
8+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
99
<PackageReference Include="App.Metrics.AspNetCore" Version="4.3.0" />
1010
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
1111
<PackageReference Include="Serilog.Enrichers.Span" Version="3.1.0" />
1212
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
1313

14-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
15-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
16-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
17-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
14+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
16+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.10.0-beta.1" />
17+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
1818
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
1919
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
2020
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.9.0-beta.1" />
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup Label="Transitive dependency updates to resolve vulnerability warnings">
27-
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-rc.2.24473.5" />
27+
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/Exceptionless.Web/ApmExtensions.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ public static IHostBuilder AddApm(this IHostBuilder builder, ApmConfig config)
6969

7070
// 404s should not be error
7171
if (activity.GetTagItem("http.status_code") is 404)
72-
activity.SetStatus(Status.Unset);
72+
{
73+
activity.SetStatus(ActivityStatusCode.Unset);
74+
}
7375
};
7476
});
7577

@@ -94,6 +96,13 @@ public static IHostBuilder AddApm(this IHostBuilder builder, ApmConfig config)
9496
if (config.MinDurationMs > 0 && activity.Duration < TimeSpan.FromMilliseconds(config.MinDurationMs))
9597
return false;
9698

99+
if (activity.GetTagItem("http.route") is string httpRoute)
100+
{
101+
// only capture 10% of config requests
102+
if (httpRoute == "api/v2/projects/config")
103+
return Random.Shared.Next(100) > 90;
104+
}
105+
97106
if (activity is { DisplayName: "LLEN", Parent: null })
98107
return false;
99108

0 commit comments

Comments
 (0)