Skip to content
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 DotNet/BuildingOS.ApiServer/BuildingOS.ApiServer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="Grpc.AspNetCore.Web" Version="2.67.0" />
<PackageReference Include="NATS.Client.Core" Version="2.5.16" />
<PackageReference Include="NATS.Client.JetStream" Version="2.5.16" />
<PackageReference Include="NATS.Client.Core" Version="3.0.0" />
<PackageReference Include="NATS.Client.JetStream" Version="3.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.17" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<!-- gRPC ingress (GatewayIngress server stub; optional, gated on GRPC_INGRESS_PORT) -->
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="NATS.Client.Core" Version="2.5.16" />
<PackageReference Include="NATS.Client.JetStream" Version="2.5.16" />
<PackageReference Include="NATS.Client.Core" Version="3.0.0" />
<PackageReference Include="NATS.Client.JetStream" Version="3.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.17" />
<PackageReference Include="AWSSDK.S3" Version="4.0.3.7" />
<!-- MQTT ingress (Scenario A: Mosquitto) -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
<PackageReference Include="NATS.Client.Core" Version="2.5.16" />
<PackageReference Include="NATS.Client.Core" Version="3.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.17" />
<!-- OpenTelemetry (traces+metrics+logs via OTLP; no-op when endpoint unset) -->
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<PackageReference Include="Testcontainers.Minio" Version="3.7.0" />
<PackageReference Include="Npgsql" Version="10.0.3" />
<PackageReference Include="AWSSDK.S3" Version="4.0.3.7" />
<PackageReference Include="NATS.Client.Core" Version="2.5.16" />
<PackageReference Include="NATS.Client.JetStream" Version="2.5.16" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.5.16" />
<PackageReference Include="NATS.Client.Core" Version="3.0.0" />
<PackageReference Include="NATS.Client.JetStream" Version="3.0.0" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="3.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.17" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions DotNet/BuildingOS.Shared/BuildingOS.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="NATS.Client.Core" Version="2.5.16" />
<PackageReference Include="NATS.Client.JetStream" Version="2.5.16" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.5.16" />
<PackageReference Include="NATS.Client.Core" Version="3.0.0" />
<PackageReference Include="NATS.Client.JetStream" Version="3.0.0" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.17">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
}, stoppingToken).ConfigureAwait(false);

var accumulator = new TelemetryBatchAccumulator();
var pending = new List<NatsJSMsg<string>>();
var pending = new List<INatsJSMsg<string>>();
var sinceFlush = Stopwatch.StartNew();

_logger.LogInformation(
Expand Down Expand Up @@ -142,7 +142,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
}

private async Task FlushAsync(
TelemetryBatchAccumulator accumulator, List<NatsJSMsg<string>> pending, Stopwatch sinceFlush, CancellationToken ct)
TelemetryBatchAccumulator accumulator, List<INatsJSMsg<string>> pending, Stopwatch sinceFlush, CancellationToken ct)
{
var dropped = accumulator.SkippedNoTimestamp;
var batches = accumulator.Drain();
Expand Down Expand Up @@ -186,7 +186,7 @@ private async Task FlushAsync(
}
}

private async Task AckAllAsync(List<NatsJSMsg<string>> pending, CancellationToken ct)
private async Task AckAllAsync(List<INatsJSMsg<string>> pending, CancellationToken ct)
{
foreach (var msg in pending)
{
Expand Down
Loading