Skip to content

Update Atc.Kusto dependency to have resiliency towards KustoServicePartialQueryFailureException #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<ItemGroup Label="Code Analyzers">
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
<PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.188" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.189" PrivateAssets="All" />
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="All" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445" PrivateAssets="All" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
</ItemGroup>

</Project>
9 changes: 7 additions & 2 deletions src/Atc.Aspire.Azure.Kusto/AspireKustoExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private static void ConfigureAzureDataExplorer(

builder.Services.ConfigureAzureDataExplorer(o =>
{
o.HostAddress = options.HostAddress.AbsoluteUri;
o.HostAddress = options.HostAddress;
o.DatabaseName = options.DatabaseName;
o.Credential = options.Credential;
});
Expand All @@ -79,7 +79,12 @@ private static void ConfigureAzureDataExplorer(

builder.TryAddHealthCheck(new HealthCheckRegistration(
healthCheckName,
sp => new KustoHealthCheck(sp.GetRequiredService<ICslQueryProvider>(), options.DatabaseName),
sp =>
{
var kustoClientProvider = sp.GetRequiredService<IKustoClientProvider>();

return new KustoHealthCheck(kustoClientProvider.GetQueryClient(), options.DatabaseName);
},
failureStatus: null,
tags: null,
timeout: options.HealthCheckTimeout > 0 ? TimeSpan.FromMilliseconds(options.HealthCheckTimeout.Value) : null));
Expand Down
12 changes: 6 additions & 6 deletions src/Atc.Aspire.Azure.Kusto/Atc.Aspire.Azure.Kusto.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Atc.Kusto" Version="2.0.1" />
<PackageReference Include="Atc.Kusto" Version="2.2.1" />
<PackageReference Include="Azure.Identity" Version="1.13.2" />
<PackageReference Include="Microsoft.Azure.Kusto.Data" Version="13.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
<PackageReference Include="Microsoft.Azure.Kusto.Data" Version="13.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.3" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/Atc.Aspire.Azure.Kusto/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
global using Aspire;
global using Atc.Aspire.Azure.Kusto;
global using Atc.Kusto;
global using Atc.Kusto.Providers.Internal;
global using Azure.Core;
global using Kusto.Data.Common;
global using Microsoft.Extensions.Configuration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Aspire.Hosting" Version="9.1.0" />
<PackageReference Include="Microsoft.Azure.Kusto.Data" Version="13.0.1" />
<PackageReference Include="Microsoft.Azure.Kusto.Data" Version="13.0.2" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions test/Atc.Aspire.Testing/Atc.Aspire.Testing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
and avoids problems with `dotnet pack`.
See https://xunit.github.io/docs/nuget-packages and the special note in https://xunit.github.io/releases/2.3.
-->
<PackageReference Include="JsonSchema.Net" Version="7.3.3" />
<PackageReference Include="JsonSchema.Net" Version="7.3.4" />
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.5.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.11.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version=" 9.0.0-beta.24568.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Atc.Test" Version="1.1.17" />
<PackageReference Include="Atc.Test" Version="1.1.18" />
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" PrivateAssets="All" />
<PackageReference Include="coverlet.collector" Version="6.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down