Files
scadaproj/components/observability
Joseph Doherty 544a6ddb77 Fix all baseline code-review findings across the six shared libraries
Resolves the 35 findings from the 2026-06-01 baseline (commit 26ba1c7),
test-first for every behavioral change. +51 tests (331 -> 382 passing, 0 failed).

- Telemetry-001 (HIGH): RedactionEnricher now honours property removal, so a
  redactor that drops a key actually scrubs the secret from the event.
- Auth: LDAP validator ValidateOnStart; API-key verify no longer fails on a
  best-effort MarkUsed write or a corrupt scopes column (fail-closed); LDAP cert
  validation hook; KeyPrefix persistence aligned; README algorithm corrected.
- Health: Akka checks return Degraded (not throw) when the cluster isn't up yet;
  GrpcDependencyHealthCheck catch-all; null 'description' rendered; composite
  endpoint builder; XML docs shipped.
- Audit: CompositeAuditWriter no longer re-throws OperationCanceledException;
  TruncatingAuditRedactor over-redact scrubs Target + safe negative max; options
  record; XML docs shipped.
- Configuration: TryAddEnumerable idempotent registration; consistent port
  quoting; strict invariant port parsing; XML docs + README packaged.
- Theme: mobile toggle is now CSS-only (no Bootstrap JS); token/CSS hygiene;
  XML docs on the public parameter surface.

Shared-contract/spec docs updated where the code was the source of truth
(observability service.instance.id, MapZbMetrics, redactor reach). All changes
additive/back-compatible at v0.1.0. code-reviews bookkeeping follows separately.
2026-06-01 11:22:14 -04:00
..

Observability (metrics / traces / logs)

Third normalized component under the operability cluster. Goal: path to shared code — converge the three sister projects onto a common OpenTelemetry Resource, a shared Serilog bootstrap with unified enrichers, and a trace↔log correlation bridge, proposed as the ZB.MOM.WW.Telemetry library set (2 packages), while each project keeps its own application instruments and sink configuration.

Why observability is a strong normalization candidate

All three projects instrument something — but in three completely different ways and at three very different levels of completeness. The divergences are structural:

  • OtOpcUa has the full OpenTelemetry SDK (metrics + tracing), Prometheus export, and a bespoke Serilog enricher for driver-lifecycle correlation — but no Resource (service.name is never set) and no trace↔log bridge.
  • MxAccessGateway has 20 hand-rolled instruments (counters, histograms, gauges) recording real production data — that never leave the process. No OTel SDK, no exporter, no tracing. Logging uses Microsoft.Extensions.Logging rather than Serilog, with a bespoke correlation-scope and redaction pipeline.
  • ScadaBridge has zero application instruments. Its OpenTelemetry.Api reference is a CVE patch, not instrumentation. It does have the cleanest structured logging enricher set (SiteId/NodeRole/NodeHostname) — but those properties exist only in Serilog, not in the OTel Resource, so logs and metrics cannot join in a backend.

Nobody sets a Resource. Nobody does trace↔log correlation. MxGateway's metrics are invisible. ScadaBridge has no metrics at all.

The common fix is a single AddZbTelemetry(options) call that: creates a shared Resource from a service.name/site.id/node.role options object; registers the project's own Meter/ActivitySource names with the OTel SDK; and exposes Prometheus /metrics. A companion AddZbSerilog(options) wires Serilog with the same options as enricher properties and adds TraceContextEnricher so logs carry trace_id/span_id. The unifying hinge: the same identity triple (service.name/site.id/ node.role) populates both the OTel Resource and the Serilog enrichers, so a metric, a span, and a log line from the same node carry identical dimensions and join up in a backend.

One adoption happens in this task: MxAccessGateway migrates off MEL onto AddZbSerilog. All other app wiring is follow-on, consistent with how Auth and UI-Theme are structured.

Status by project

Project OTel SDK today Metrics today Tracing today Logging today Enrichers today Adoption status
OtOpcUa full SDK (WithMetrics+WithTracing) 7 instruments (otopcua.*); Prometheus /metrics 🟡 2 spans defined; no exporter Serilog (Console+File) DriverInstanceId/DriverType/CapabilityName/CorrelationId (driver-scope) Not started (follow-on)
MxAccessGateway none (hand-rolled Meter) 🟡 20 instruments (mxgateway.*); never exported none Serilog (migrated from MEL — adopted) SiteId/NodeRole/NodeHostname (via AddZbSerilog); session/worker enrichers via LogContext.PushProperty Logging adopted; OTel metrics/traces follow-on
ScadaBridge (OpenTelemetry.Api CVE-patch only) zero instruments none Serilog (Console+File) SiteId/NodeRole/NodeHostname (process-level; strongest set) Not started (follow-on)

See each project's current-state/<project>/CURRENT-STATE.md for the code-verified detail and its adoption plan.

Normalized vs. left per-project

Normalized (the shared target):

  • AddZbTelemetry(ZbTelemetryOptions) — front door for the OTel SDK. Populates the shared Resource (service.name, service.namespace, service.version, site.id, node.role, host.name). Registers the caller-supplied Meter and ActivitySource name(s). Wires standard instrumentation (ASP.NET Core, HttpClient, runtime, process). Prometheus default; OTLP opt-in.
  • app.MapZbMetrics() — maps the Prometheus /metrics endpoint (shared path + shared exporter).
  • AddZbSerilog(ZbTelemetryOptions) — shared Serilog two-stage bootstrap generalizing ScadaBridge's LoggerConfigurationFactory. Wires SiteId/NodeRole/NodeHostname enrichers from the same options object as the OTel Resource. Wires TraceContextEnricher (trace_id/span_id from Activity.Current). Preserves ReadFrom.Configuration for sinks and explicit MinimumLevel.Is override.
  • ILogRedactor seam — generalized from MxGateway's GatewayLogRedactor. The seam is shared; the redaction policy (which fields/commands) stays per-project.
  • Metric naming convention: <meter>.<subsystem>.<event>; Meter name = project namespace (ZB.MOM.WW.<ProjectName>); duration unit = s (OTel semconv).

Left per-project (not forced together):

  • Application Meter, ActivitySource, and all instrument definitions — otopcua.*, mxgateway.*, scadabridge.* instruments are owned by each repo.
  • Serilog sink configuration (appsettings.json Console/File templates, rolling intervals).
  • Per-operation/per-session correlation enrichers (LogContextEnricher in OtOpcUa; LogContext.PushProperty scope in MxGateway after migration).
  • Redaction policies (MxGatewayLogRedactor implements ILogRedactor with gateway-specific command/field rules).
  • Config section paths for SiteId/NodeRole/NodeHostname — each project binds these from its own config hierarchy and passes the resolved values to AddZbTelemetry/AddZbSerilog.

Package structure

ZB.MOM.WW.Telemetry ships as two dependency-split packages:

Package Contents Consumers
ZB.MOM.WW.Telemetry AddZbTelemetry, ZbTelemetryOptions, Resource builder, standard instrumentation, Prometheus/OTLP exporters, app.MapZbMetrics() All three
ZB.MOM.WW.Telemetry.Serilog AddZbSerilog, shared enrichers (SiteId/NodeRole/NodeHostname/TraceContextEnricher), ILogRedactor seam All three (Serilog users); MxGateway on migration

Both packages share ZbTelemetryOptions as the single options object that drives Resource attributes, Serilog enrichers, Meter/ActivitySource names, and exporter selection — the unifying hinge that makes a metric, a span, and a log line from the same node carry identical dimensions.

Component status

Status: Built @ 0.1.0. MxAccessGateway MEL → Serilog logging adopted (on its own branch). OtOpcUa and ScadaBridge telemetry adoption is follow-on, tracked in GAPS.md.

The shared library lives at ~/Desktop/scadaproj/ZB.MOM.WW.Telemetry/ (.NET 10; 2 packages — ZB.MOM.WW.Telemetry and ZB.MOM.WW.Telemetry.Serilog; 19 tests; dotnet pack → 2 nupkgs @ 0.1.0). Build/test/pack from ZB.MOM.WW.Telemetry/:

dotnet test ZB.MOM.WW.Telemetry.slnx
dotnet pack ZB.MOM.WW.Telemetry.slnx -c Release -o ./artifacts