feat(alarms): thread an additive AckTime through the native-alarm mirror
MES alarm-status API §6.4 (docs/plans/2026-06-30-mes-alarm-status-api.md,
Phase 1 task 1). MES needs a real AckDT for a triggered alarm, and the mirror
carried acked-vs-unacked but never WHEN. AckTime now rides the whole path:
DCL transition -> AlarmStateChanged -> gRPC AlarmStateUpdate -> site SQLite.
Stamping rule, identical on both protocols: non-null ONLY while the condition
is active AND acknowledged. That single predicate yields all three required
behaviours -- null while unacked, cleared on re-raise (a re-raise arrives
unacknowledged), and no phantom ack on a return-to-normal. The last one is
load-bearing for MxGateway, which maps INACTIVE to Acknowledged = true; without
the active check every clear would claim an ack the system never observed.
Provenance is honest, never fabricated:
- OPC UA A&C supplies a TRUE ack instant, so we now select it:
AcknowledgeableConditionType/AckedState/TransitionTime at SelectClause
index 18, APPENDED so the positional reads at 0-17 keep their meaning.
Servers that omit the field fall back to the event's own Time.
- MxAccess Gateway supplies none, so the ack transition's own timestamp is
used -- accurate to when the system SAW the ack. An ACTIVE_ACKED
re-subscribe snapshot restores one from LastTransitionTimestamp rather
than dropping it.
The decision lives in pure mappers (Opc/Mx AlarmMapper.DeriveAckTime), so it is
unit-tested with no live server or gateway.
Additive-only throughout: init-only property on AlarmStateChanged, trailing
optional positional on NativeAlarmTransition (all 14-arg call sites untouched),
proto field 24 (never reusing a number) regenerated via docker/regen-proto.sh
sitestream with the csproj diff verified empty.
Persistence rides native_alarm_state's existing metadata_json blob rather than
a new column -- deliberately. That table is RegisterReplicated in
SiteLocalDbSetup and LocalDb builds its CDC triggers from the column list at
registration time, so an additive JSON property changes no schema, no triggers
and no replication contract; metadata_json is exactly the extension point UA4
introduced for this. Rows written before the field deserialize it as null.
Tests: 4 OPC UA + 6 MxGateway mapper cases, 3 NativeAlarmActor (emit,
failover rehydrate, pre-AckTime row), 1 proto round-trip incl. the null case,
4 Commons additive/back-compat. The OPC UA SelectClause count lock-in moves
18 -> 19 with an index-18 assertion -- intended, the clause is appended, which
is precisely what that guard exists to make visible.
This commit is contained in:
@@ -176,4 +176,52 @@ public class OpcUaAlarmMapperTests
|
||||
Assert.Contains('.', result); // invariant culture: '.' not ','
|
||||
Assert.Equal("1.5", result);
|
||||
}
|
||||
|
||||
// ── MES alarm-status API §6.4: AckTime stamping ──
|
||||
|
||||
private static readonly DateTimeOffset SourceAck =
|
||||
new(2026, 8, 1, 10, 0, 0, TimeSpan.Zero);
|
||||
private static readonly DateTimeOffset Observed =
|
||||
new(2026, 8, 1, 10, 5, 0, TimeSpan.Zero);
|
||||
|
||||
[Fact]
|
||||
public void DeriveAckTime_ActiveAcked_PrefersTheSourcesOwnAckInstant()
|
||||
{
|
||||
// OPC UA A&C DOES supply a true ack time (AckedState/TransitionTime). When the
|
||||
// server sends it, it must win over the coarser observation time — that is the
|
||||
// whole point of selecting field 18.
|
||||
Assert.Equal(
|
||||
SourceAck,
|
||||
OpcUaAlarmMapper.DeriveAckTime(active: true, acked: true, SourceAck, Observed));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DeriveAckTime_ActiveAcked_WithoutSourceTime_FallsBackToObservationTime()
|
||||
{
|
||||
// Servers may omit AckedState/TransitionTime (base ConditionType events, or a
|
||||
// server that does not expose it). The fallback is the event's own time — real,
|
||||
// just coarser. Never fabricated, never null-when-acked.
|
||||
Assert.Equal(
|
||||
Observed,
|
||||
OpcUaAlarmMapper.DeriveAckTime(active: true, acked: true, sourceAckTime: null, Observed));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DeriveAckTime_Unacked_IsNull_EvenWhenSourceReportsAnAckTransition()
|
||||
{
|
||||
// AckedState/TransitionTime also stamps the flip BACK to unacked on a re-raise,
|
||||
// so it is present-but-meaningless there. The acked check is what makes "null
|
||||
// while unacked" and "cleared on re-raise" hold.
|
||||
Assert.Null(OpcUaAlarmMapper.DeriveAckTime(
|
||||
active: true, acked: false, sourceAckTime: SourceAck, Observed));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void DeriveAckTime_Inactive_IsNull()
|
||||
{
|
||||
// A cleared condition is on its way out of the mirror and reports no ack time,
|
||||
// matching the MxGateway mapper (where INACTIVE maps to acked = true).
|
||||
Assert.Null(OpcUaAlarmMapper.DeriveAckTime(
|
||||
active: false, acked: true, sourceAckTime: SourceAck, Observed));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user