257214f775
PR #423 shipped GatewayTagProvisioner + unit tests but never registered it in DI nor passed it into the AddressSpaceApplier, so deploying historized tags used the no-op NullHistorianProvisioning and never called the gateway's EnsureTags (confirmed live on wonder-app-vd03: zero EnsureTags calls on a historized deploy). Addresses HISTORIAN-GATEWAY-INTEGRATION-ISSUES.md. Issue 1 (wire provisioner): - Runtime: AddHistorianProvisioning extension (gated on ServerHistorian:Enabled, mirrors AddServerHistorian) + NullHistorianProvisioning TryAdd default in AddOtOpcUaRuntime; WithOtOpcUaRuntimeActors resolves IHistorianProvisioning and passes it into the applier. - Gateway driver: GatewayHistorian.CreateProvisioner factory (mirrors CreateDataSource). - Host: Program.cs calls AddHistorianProvisioning after AddServerHistorian. - Tests: AddHistorianProvisioningTests (config-gated registration + the register->resolve->applier->EnsureTags chain). Issue 2 (observability): AddressSpaceApplier logs the provisioning tally on every successful dispatch (was gated behind Failed/Skipped > 0), including dispatched=N so a dispatched=N/requested=0 line flags the dormant no-op. +2 tests. Issue 3 (30s HistoryRead on unprovisioned tags): root coupling fixed by Issue 1; documented the CallTimeout knob + coupling. Default left at 30s pending the multi-data-point investigation the issue requests (lowering risks truncating legitimate large reads). Issue 4 (docs): docs/Historian.md gains a "Tag auto-provisioning (EnsureTags)" section and CLAUDE.md a wiring/gating note (both stress ServerHistorian:Enabled). Sibling scadaproj/CLAUDE.md carries no false claim -> unchanged. Pre-existing Serilog observation: anchor CWD to AppContext.BaseDirectory before AddZbSerilog so the relative file sink stops landing in C:\Windows\System32 under the Windows-service CWD. Builds 0-error; Runtime.Tests 355, OpcUaServer.Tests 329, Gateway.Tests 99 (+4 live-skipped) all green.
118 lines
7.3 KiB
C#
118 lines
7.3 KiB
C#
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
|
using ZB.MOM.WW.OtOpcUa.Core.AlarmHistorian;
|
|
using ZB.MOM.WW.OtOpcUa.Runtime.Historian;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Historian.Gateway;
|
|
|
|
/// <summary>
|
|
/// Host-callable factories that build the gateway-backed historian seams against the single
|
|
/// <c>ServerHistorian</c> gateway: <see cref="CreateDataSource"/> for the read path (the Host's
|
|
/// <c>AddServerHistorian</c> wiring) and <see cref="CreateAlarmWriter"/> for the alarm-write path
|
|
/// (the Host's <c>AddAlarmHistorian</c> wiring). Both keep the concrete package-client dependency
|
|
/// inside this driver project — the Host references only the driver, not the package client directly.
|
|
/// </summary>
|
|
public static class GatewayHistorian
|
|
{
|
|
/// <summary>
|
|
/// Builds a <see cref="GatewayHistorianDataSource"/> over a lazily connected
|
|
/// <see cref="HistorianGatewayClientAdapter"/> mapped from the bound
|
|
/// <see cref="ServerHistorianOptions"/>. Resolves an <see cref="ILoggerFactory"/> and the data
|
|
/// source's <see cref="ILogger{TCategoryName}"/> from <paramref name="services"/>, falling back to
|
|
/// the null implementations when absent (e.g. minimal test providers). Performs no network I/O —
|
|
/// the underlying channel dials on first use.
|
|
/// </summary>
|
|
/// <param name="options">The bound <c>ServerHistorian</c> configuration.</param>
|
|
/// <param name="services">The resolving service provider (used only to locate logging services).</param>
|
|
/// <returns>The gateway-backed <see cref="IHistorianDataSource"/>.</returns>
|
|
public static IHistorianDataSource CreateDataSource(ServerHistorianOptions options, IServiceProvider services)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(options);
|
|
ArgumentNullException.ThrowIfNull(services);
|
|
|
|
var loggerFactory = services.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
|
|
var logger = services.GetService<ILogger<GatewayHistorianDataSource>>()
|
|
?? NullLogger<GatewayHistorianDataSource>.Instance;
|
|
|
|
return new GatewayHistorianDataSource(
|
|
HistorianGatewayClientAdapter.Create(options, loggerFactory),
|
|
logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds a <see cref="GatewayAlarmHistorianWriter"/> over a lazily connected
|
|
/// <see cref="HistorianGatewayClientAdapter"/> mapped from the bound
|
|
/// <see cref="ServerHistorianOptions"/> — the <b>same single gateway</b> the read path
|
|
/// (<see cref="CreateDataSource"/>) targets. The Host's <c>AddAlarmHistorian</c> wiring supplies
|
|
/// this as the concrete <see cref="IAlarmHistorianWriter"/> the durable
|
|
/// <c>SqliteStoreAndForwardSink</c> drain worker delegates to, sourcing the connection from the
|
|
/// <c>ServerHistorian</c> section (endpoint/key/TLS) rather than the legacy Wonderware-shaped
|
|
/// <c>AlarmHistorian</c> host/port. Resolves an <see cref="ILoggerFactory"/> and the writer's
|
|
/// <see cref="ILogger{TCategoryName}"/> from <paramref name="services"/>, falling back to the null
|
|
/// implementations when absent. Performs no network I/O — the underlying channel dials on first send.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// This deliberately constructs its <b>own</b> <see cref="HistorianGatewayClientAdapter"/> — a
|
|
/// second gRPC channel to the same gateway as the read path. Collapsing the two onto one shared
|
|
/// channel would require the container to own a singleton <see cref="IHistorianGatewayClient"/> and
|
|
/// the read-side <see cref="GatewayHistorianDataSource"/> to stop owning + disposing its client,
|
|
/// regressing the read cutover's dispose ownership (and its tests). A second channel to a co-located
|
|
/// sidecar is cheap — the gateway pools and amortizes the underlying historian sessions server-side —
|
|
/// so each path keeps its own channel with a clean, independent lifetime.
|
|
/// </remarks>
|
|
/// <param name="options">The bound <c>ServerHistorian</c> configuration (endpoint, key, TLS posture).</param>
|
|
/// <param name="services">The resolving service provider (used only to locate logging services).</param>
|
|
/// <returns>The gateway-backed <see cref="IAlarmHistorianWriter"/>.</returns>
|
|
public static IAlarmHistorianWriter CreateAlarmWriter(ServerHistorianOptions options, IServiceProvider services)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(options);
|
|
ArgumentNullException.ThrowIfNull(services);
|
|
|
|
var loggerFactory = services.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
|
|
var logger = services.GetService<ILogger<GatewayAlarmHistorianWriter>>()
|
|
?? NullLogger<GatewayAlarmHistorianWriter>.Instance;
|
|
|
|
return new GatewayAlarmHistorianWriter(
|
|
HistorianGatewayClientAdapter.Create(options, loggerFactory),
|
|
logger);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Builds a <see cref="GatewayTagProvisioner"/> over a lazily connected
|
|
/// <see cref="HistorianGatewayClientAdapter"/> mapped from the bound
|
|
/// <see cref="ServerHistorianOptions"/> — the <b>same single gateway</b> the read path
|
|
/// (<see cref="CreateDataSource"/>) and alarm-write path (<see cref="CreateAlarmWriter"/>) target. The
|
|
/// Host's <c>AddHistorianProvisioning</c> wiring supplies this as the concrete
|
|
/// <see cref="IHistorianProvisioning"/> the <c>AddressSpaceApplier</c> calls (non-blocking
|
|
/// <c>EnsureTags</c>) when a deploy adds historized tags, so a brand-new historized tag exists in the
|
|
/// historian before the recorder's <c>WriteLiveValues</c> land. Resolves an <see cref="ILoggerFactory"/>
|
|
/// and the provisioner's <see cref="ILogger{TCategoryName}"/> from <paramref name="services"/>, falling
|
|
/// back to the null implementations when absent. Performs no network I/O — the underlying channel dials
|
|
/// on first <c>EnsureTags</c>.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Like <see cref="CreateAlarmWriter"/>, this constructs its <b>own</b>
|
|
/// <see cref="HistorianGatewayClientAdapter"/> — a separate gRPC channel to the same gateway. A second
|
|
/// channel to a co-located sidecar is cheap (the gateway pools the historian sessions server-side), and
|
|
/// it keeps each path's channel lifetime clean and independent.
|
|
/// </remarks>
|
|
/// <param name="options">The bound <c>ServerHistorian</c> configuration (endpoint, key, TLS posture).</param>
|
|
/// <param name="services">The resolving service provider (used only to locate logging services).</param>
|
|
/// <returns>The gateway-backed <see cref="IHistorianProvisioning"/>.</returns>
|
|
public static IHistorianProvisioning CreateProvisioner(ServerHistorianOptions options, IServiceProvider services)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(options);
|
|
ArgumentNullException.ThrowIfNull(services);
|
|
|
|
var loggerFactory = services.GetService<ILoggerFactory>() ?? NullLoggerFactory.Instance;
|
|
var logger = services.GetService<ILogger<GatewayTagProvisioner>>()
|
|
?? NullLogger<GatewayTagProvisioner>.Instance;
|
|
|
|
return new GatewayTagProvisioner(
|
|
HistorianGatewayClientAdapter.Create(options, loggerFactory),
|
|
logger);
|
|
}
|
|
}
|