6fe23a4d9b
M3 Bundle F (Task F1) wires the cached-call audit pipeline through the composition roots: - Central: register SiteCallAuditActor as a cluster singleton + proxy (mirrors AuditLogIngestActor and NotificationOutboxActor). Program.cs calls .AddSiteCallAudit() on the central role. - Site: register ICachedCallTelemetryForwarder + CachedCallLifecycleBridge in AddAuditLog (lazy factory — Central nodes degrade to audit-only emission because IOperationTrackingStore is site-only). - Site: bind CachedCallLifecycleBridge to ICachedCallLifecycleObserver so StoreAndForwardService picks it up via DI. - Site: introduce IStoreAndForwardSiteContext + Host adapter to surface the site id to StoreAndForwardService without creating a StoreAndForward -> HealthMonitoring project-reference cycle. - ScriptExecutionActor resolves ICachedCallTelemetryForwarder per script scope and threads it into ScriptRuntimeContext. CachedCallTelemetryForwarder's IOperationTrackingStore dependency is now nullable so Central DI validation succeeds with the lazy registration; the forwarder's tracking-half emission is a no-op when the store is absent. Tests: - AkkaHostedServiceAuditWiringTests: Central host builds with AddSiteCallAudit and resolves ICachedCallTelemetryForwarder; Site resolves the forwarder + bridge + observer + IStoreAndForwardSiteContext. - Full solution: 194 Host tests green, 241 SiteRuntime tests green, every other suite unchanged.
67 lines
2.9 KiB
C#
67 lines
2.9 KiB
C#
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Options;
|
|
using ScadaLink.Commons.Interfaces.Services;
|
|
|
|
namespace ScadaLink.StoreAndForward;
|
|
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
public static IServiceCollection AddStoreAndForward(this IServiceCollection services)
|
|
{
|
|
services.AddSingleton<StoreAndForwardStorage>(sp =>
|
|
{
|
|
var options = sp.GetRequiredService<IOptions<StoreAndForwardOptions>>().Value;
|
|
var logger = sp.GetRequiredService<ILogger<StoreAndForwardStorage>>();
|
|
return new StoreAndForwardStorage(
|
|
$"Data Source={options.SqliteDbPath}",
|
|
logger);
|
|
});
|
|
|
|
services.AddSingleton<StoreAndForwardService>(sp =>
|
|
{
|
|
var storage = sp.GetRequiredService<StoreAndForwardStorage>();
|
|
var options = sp.GetRequiredService<IOptions<StoreAndForwardOptions>>().Value;
|
|
var logger = sp.GetRequiredService<ILogger<StoreAndForwardService>>();
|
|
var replication = sp.GetRequiredService<ReplicationService>();
|
|
// Audit Log #23 (M3 Bundle F): Wire the cached-call lifecycle
|
|
// observer + site identity through DI so the S&F retry loop emits
|
|
// per-attempt + terminal telemetry under the same TrackedOperationId
|
|
// the script-thread CachedSubmit row used. Both bindings are
|
|
// optional — when null the legacy pre-M3 retry behaviour is
|
|
// preserved exactly (tests, central nodes without sites, hosts
|
|
// that haven't called AddAuditLog).
|
|
//
|
|
// Site identity is resolved through the optional
|
|
// IStoreAndForwardSiteContext binding (registered by the Host) to
|
|
// avoid a project-reference cycle with HealthMonitoring's
|
|
// ISiteIdentityProvider — HealthMonitoring already references S&F.
|
|
var cachedCallObserver = sp.GetService<ICachedCallLifecycleObserver>();
|
|
var siteContext = sp.GetService<IStoreAndForwardSiteContext>();
|
|
var siteId = siteContext?.SiteId ?? string.Empty;
|
|
return new StoreAndForwardService(
|
|
storage,
|
|
options,
|
|
logger,
|
|
replication,
|
|
cachedCallObserver,
|
|
siteId);
|
|
});
|
|
|
|
services.AddSingleton<ReplicationService>(sp =>
|
|
{
|
|
var options = sp.GetRequiredService<IOptions<StoreAndForwardOptions>>().Value;
|
|
var logger = sp.GetRequiredService<ILogger<ReplicationService>>();
|
|
return new ReplicationService(options, logger);
|
|
});
|
|
|
|
return services;
|
|
}
|
|
|
|
public static IServiceCollection AddStoreAndForwardActors(this IServiceCollection services)
|
|
{
|
|
// Akka actor registration handled by Host component during actor system startup
|
|
return services;
|
|
}
|
|
}
|