Joseph Doherty
a212283104
WP2.6 (arch-review remediation, cross-cutting misc): - SiteExternalSystemRepository: name/ID-indexed ExternalSystemDefinitionCache replaces the fetch-all + reverse-map scan on every by-ID/method lookup; loaded once per redeploy, invalidated by DeploymentManagerActor after HandleDeployArtifacts applies external-system changes. Static JsonSerializerOptions for method-list parsing. - Inbound API: short-TTL ApiMethodCache fronts the per-request ApiMethod repository fetch; invalidated by name via the existing ScriptArtifactChangeSubscriber/ IScriptArtifactChangeBus pipeline, self-healing via TTL for changes the bus doesn't cover (e.g. Management API edits). - StoreAndForward: the cached-call audit-observer queue — the one unbounded channel left in the system — is now bounded (ObserverQueueCapacity, default 10,000) with DropOldest overflow and a dropped-notification counter. - SiteStreamManager: alarm state changes now travel a dedicated publish source/broadcast hub, isolated from the (far higher-volume) attribute path, so an attribute storm can no longer evict a pending alarm transition; the alarm hand-off queue is bounded with a drop counter surfaced on the site health report (SiteStreamAlarmDropCount via the new SiteStreamAlarmDropReporter), and publishing is skipped entirely at zero subscribers on either path. - CLI ManagementHttpClient: explicit 30s HttpClient.Timeout on the shared construction (was the 100s framework default), overridable via SCADABRIDGE_HTTP_TIMEOUT_SECONDS. Deviation: the failback-probe heartbeat item is NOT included — its only viable surface (CentralChannelProvider.cs / heartbeat consumers) lives entirely in the Communication project, explicitly off-limits to this work package this phase. Tests: SiteRuntime.Tests (550), InboundAPI.Tests (278), StoreAndForward.Tests (133), CLI.Tests (390), HealthMonitoring.Tests (97) — all green after full solution build.
58 lines
2.4 KiB
C#
58 lines
2.4 KiB
C#
using Akka.TestKit.Xunit2;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.ScadaBridge.HealthMonitoring;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Streaming;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests.Streaming;
|
|
|
|
/// <summary>
|
|
/// WP2.6d: the hosted reporter must lift <see cref="SiteStreamManager.AlarmPublishDroppedCount"/>
|
|
/// onto the site health report via <see cref="ISiteHealthCollector"/>. Uses the real
|
|
/// collector (mirrors <c>ScriptSchedulerStatsReporterTests</c> — NSubstitute is not
|
|
/// referenced by this test project). The queue's own drop-counting mechanism is verified
|
|
/// deterministically and separately by
|
|
/// <see cref="Streaming.SiteStreamManagerTests.CreateAlarmPublishQueue_OverCapacity_DropsOldestAndInvokesCallback"/>;
|
|
/// this test proves the reporter's poll-and-push wiring runs correctly.
|
|
/// </summary>
|
|
public class SiteStreamAlarmDropReporterTests : TestKit, IDisposable
|
|
{
|
|
void IDisposable.Dispose() => Shutdown();
|
|
|
|
[Fact]
|
|
public async Task Reporter_PushesAlarmDropCountToCollector()
|
|
{
|
|
var options = new SiteRuntimeOptions { StreamBufferSize = 100 };
|
|
var collector = new SiteHealthCollector();
|
|
var streamManager = new SiteStreamManager(options, NullLogger<SiteStreamManager>.Instance);
|
|
streamManager.Initialize(Sys);
|
|
|
|
using var reporter = new SiteStreamAlarmDropReporter(
|
|
collector, streamManager, NullLogger<SiteStreamAlarmDropReporter>.Instance,
|
|
pollInterval: TimeSpan.FromMilliseconds(50));
|
|
|
|
await reporter.StartAsync(CancellationToken.None);
|
|
try
|
|
{
|
|
// The immediate first probe (no drops yet) must reach the report as 0 —
|
|
// proving the reporter actually ran and pushed a value, not that the field
|
|
// simply defaulted.
|
|
await WaitUntilAsync(() =>
|
|
collector.CollectReport("site-1").SiteStreamAlarmDropCount == streamManager.AlarmPublishDroppedCount);
|
|
|
|
var report = collector.CollectReport("site-1");
|
|
Assert.Equal(streamManager.AlarmPublishDroppedCount, report.SiteStreamAlarmDropCount);
|
|
}
|
|
finally
|
|
{
|
|
await reporter.StopAsync(CancellationToken.None);
|
|
}
|
|
}
|
|
|
|
private static async Task WaitUntilAsync(Func<bool> condition)
|
|
{
|
|
for (var i = 0; i < 100 && !condition(); i++)
|
|
await Task.Delay(50);
|
|
Assert.True(condition(), "condition not met within timeout");
|
|
}
|
|
}
|