c254d0740e
Implements WP3.2 stage (b) per docs/plans/2026-08-15-site-events-policy-design.md.
- Per-run instance-script Started/Completed Info site events are now off by
default (SiteRuntimeOptions.PerRunScriptEvents=false) instead of firing on
every run, closing the dominant site_events writer. Gated at the ScriptRunLauncher
call sites (moved there from ScriptExecutionActor by WP3.1). Error-level events
(timeout/failure/stuck-watchdog/recursion-limit) remain unconditional.
- ScriptRunSummaryRecorder accumulates per-(instance, script) run counters and a
new site-only ScriptRunSummaryFlushService emits one aggregate "script" Info
site event per ScriptRunSummaryIntervalSeconds (default 300s), top-50-script
breakdown with an "others" rollup, zero-activity intervals emit nothing.
- Per-script opt-in via PerRunScriptEventScripts ("Instance/Script" exact or
"Instance/*" wildcard), matched by the new pure ScriptRunEventPolicy. All three
options are read from IOptionsMonitor<SiteRuntimeOptions> per run, so the
policy is hot-togglable without a restart.
- Fixed the stale "event log is not replicated" comment at AkkaHostedService.cs
(~905): site_events IS registered in SiteLocalDbSetup.ReplicatedTables — the
singleton is what makes queries always hit the actively-written copy;
replication is what gives the singleton history to read after a failover
(memo Decision (b)). site_events replication itself is unchanged (still
registered) and already pinned by
tests/ZB.MOM.WW.ScadaBridge.Host.Tests/SiteLocalDbCdcRegistrationTests.cs.
- Updated Component-SiteEventLogging.md (Volume Policy section, corrected
Storage/replication rationale) and Component-SiteRuntime.md (Script Run
Launch + Error Handling sections).
104 lines
4.1 KiB
C#
104 lines
4.1 KiB
C#
using System.Collections.Concurrent;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Options;
|
|
using ZB.MOM.WW.ScadaBridge.SiteEventLogging;
|
|
using ZB.MOM.WW.ScadaBridge.SiteRuntime.Scripts;
|
|
|
|
namespace ZB.MOM.WW.ScadaBridge.SiteRuntime.Tests.TestSupport;
|
|
|
|
/// <summary>
|
|
/// M1 Site Event Logging categories: a capturing fake <see cref="ISiteEventLogger"/>
|
|
/// used by the actor tests to assert that the right operational events are emitted.
|
|
/// Thread-safe — the actors fire-and-forget <c>LogEventAsync</c> from background
|
|
/// tasks, so multiple captures can land concurrently.
|
|
/// </summary>
|
|
public sealed class FakeSiteEventLogger : ISiteEventLogger
|
|
{
|
|
/// <summary>One captured <see cref="ISiteEventLogger.LogEventAsync"/> invocation.</summary>
|
|
public sealed record Entry(
|
|
string EventType,
|
|
string Severity,
|
|
string? InstanceId,
|
|
string Source,
|
|
string Message,
|
|
string? Details);
|
|
|
|
private readonly ConcurrentQueue<Entry> _entries = new();
|
|
|
|
/// <summary>All captured events, in arrival order.</summary>
|
|
public IReadOnlyList<Entry> Entries => _entries.ToArray();
|
|
|
|
/// <summary>Captured events filtered to a single category.</summary>
|
|
public IReadOnlyList<Entry> OfType(string eventType) =>
|
|
_entries.Where(e => e.EventType == eventType).ToArray();
|
|
|
|
/// <inheritdoc />
|
|
public Task LogEventAsync(
|
|
string eventType,
|
|
string severity,
|
|
string? instanceId,
|
|
string source,
|
|
string message,
|
|
string? details = null)
|
|
{
|
|
_entries.Enqueue(new Entry(eventType, severity, instanceId, source, message, details));
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public long FailedWriteCount => 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Minimal <see cref="IServiceProvider"/> that resolves a single
|
|
/// <see cref="ISiteEventLogger"/> — enough for the actors' optional
|
|
/// <c>_serviceProvider?.GetService<ISiteEventLogger>()</c> resolution
|
|
/// without pulling a full DI container into the actor tests.
|
|
/// <para>
|
|
/// Also serves <see cref="IServiceScopeFactory"/> (returning a scope that just
|
|
/// re-exposes this provider) so callers that do
|
|
/// <c>serviceProvider.CreateScope()</c> — e.g. <c>ScriptExecutionActor</c> —
|
|
/// don't throw before they reach the logging hot path.
|
|
/// </para>
|
|
/// </summary>
|
|
/// <param name="logger">The event logger to resolve for <see cref="ISiteEventLogger"/>.</param>
|
|
/// <param name="optionsMonitor">
|
|
/// WP3.2: optional <see cref="IOptionsMonitor{TOptions}"/> for <see cref="SiteRuntimeOptions"/>
|
|
/// — resolves for the hot-toggle tests; null (the default) exercises the launcher's
|
|
/// constructor-passed-options fallback, matching every pre-WP3.2 caller of this class.
|
|
/// </param>
|
|
/// <param name="summaryRecorder">
|
|
/// WP3.2: optional <see cref="ScriptRunSummaryRecorder"/> — resolves so a test can assert on
|
|
/// the aggregate counters a run produced; null (the default) exercises the launcher's
|
|
/// null-safe skip path.
|
|
/// </param>
|
|
public sealed class SingleServiceProvider(
|
|
ISiteEventLogger logger,
|
|
IOptionsMonitor<SiteRuntimeOptions>? optionsMonitor = null,
|
|
ScriptRunSummaryRecorder? summaryRecorder = null)
|
|
: IServiceProvider, IServiceScopeFactory, IServiceScope
|
|
{
|
|
private readonly ISiteEventLogger _logger = logger;
|
|
private readonly IOptionsMonitor<SiteRuntimeOptions>? _optionsMonitor = optionsMonitor;
|
|
private readonly ScriptRunSummaryRecorder? _summaryRecorder = summaryRecorder;
|
|
|
|
/// <inheritdoc />
|
|
public object? GetService(Type serviceType)
|
|
{
|
|
if (serviceType == typeof(ISiteEventLogger)) return _logger;
|
|
if (serviceType == typeof(IServiceScopeFactory)) return this;
|
|
if (serviceType == typeof(IOptionsMonitor<SiteRuntimeOptions>)) return _optionsMonitor;
|
|
if (serviceType == typeof(ScriptRunSummaryRecorder)) return _summaryRecorder;
|
|
return null;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public IServiceScope CreateScope() => this;
|
|
|
|
/// <inheritdoc />
|
|
public IServiceProvider ServiceProvider => this;
|
|
|
|
/// <inheritdoc />
|
|
public void Dispose() { }
|
|
}
|