Files
Copilot d525bc3f28 Bound reconnect cleanup and organize samples by domain (#4276)
# Description

This PR fixes bounded ManagedSession reconnect cleanup and reorganizes
the sample applications into domain-focused folders.

## Reconnect cleanup

- Bounds reconnect integration cleanup with independent 30-second close
and dispose limits.
- Sends `CloseSession` through the awaited transport request path during
`Session.DisposeAsync`.
- Preserves explicit `Session.CloseAsync` behavior that waits for or
cancels outstanding publish requests.
- Covers the disposal request path with a regression test.

## Sample organization

- `samples/OpenUsd`: `GeneratorServer`, `SiteCompositionServer`
- `samples/Redundancy`: `RedundantClient`, `RedundantServer`,
`RedundantPubSub`
- `samples/Isa95`: `MinimalIsa95Server`
- `samples/MinimalApi`: `MinimalBoilerServer`, `MinimalCalcServer`,
`MinimalClient`
- `samples/DI`: `PumpDeviceIntegrationServer`
- `samples/Lds`: `ConsoleLdsServer`
- `samples/Reference`: `ConsoleReferenceClient`,
`ConsoleReferenceServer`
- `samples/PubSub`: `ConsoleReferencePubSubClient`

`UA.slnx` now exposes the same requested domain groups. Project
references, tests, runtime sample probes, CI workflows, Dockerfiles,
Compose files, helper scripts, and documentation were updated to the new
paths. `samples/Robotics/MinimalRobotServer` remains under `Robotics`.

## Validation

- `dotnet build UA.slnx`
- 3 Redundancy short-haul sample tests
- 70 DI sample tests
- 914 OpenUSD tests
- 1 WotCon model-materialization test
- 137 AOT tests
- `docker compose config` for all 6 moved Redundancy Compose files

## Related Issues

- Fixes #4273

## Checklist

- [ ] I have signed the
[CLA](https://opcfoundation.org/license/cla/ContributorLicenseAgreementv1.0.pdf)
and read the
[CONTRIBUTING](https://github.com/OPCFoundation/UA-.NETStandard/blob/master/CONTRIBUTING.md)
doc.
- [x] I have added tests that prove my fix is effective or that my
feature works and increased code coverage.
- [x] I have added all necessary documentation.
- [x] I have verified that my changes do not introduce new build or
analyzer warnings.
- [x] I built the complete `UA.slnx` solution locally.
- [ ] I ran all tests locally against at least .NET Framework and .NET
10.
- [ ] I fixed all failing and flaky tests in the CI pipelines and all
CodeQL warnings.
- [x] I have addressed all PR feedback received.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: marcschier <11168470+marcschier@users.noreply.github.com>
Co-authored-by: Marc Schier <mschier@microsoft.com>
Co-authored-by: Marc Schier <marcschier@users.noreply.github.com>
Copilot-Session: a2c2838f-74ae-4997-a1d4-50574d9e0636
2026-08-21 04:35:47 +00:00

208 lines
8.3 KiB
C#

/* ========================================================================
* Copyright (c) 2005-2025 The OPC Foundation, Inc. All rights reserved.
*
* OPC Foundation MIT License 1.00
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* The complete license agreement can be found here:
* http://opcfoundation.org/License/MIT/1.00/
* ======================================================================*/
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Opc.Ua;
using Opc.Ua.Client;
using Opc.Ua.Client.Alarms;
using Opc.Ua.Client.Subscriptions.Streaming;
using Quickstarts.ConsoleReferenceClient;
namespace Quickstarts
{
/// <summary>
/// Sample code demonstrating Part 9 Alarms and Conditions client
/// API: <see cref="AlarmClient"/> for typed alarm operations and
/// the streaming subscription API for alarm event monitoring.
/// </summary>
public class AlarmClientSample
{
private readonly ILogger m_logger;
private readonly ITelemetryContext m_telemetry;
/// <summary>
/// Constructs a new sample.
/// </summary>
public AlarmClientSample(ILogger logger, ITelemetryContext telemetry)
{
m_logger = logger ?? throw new ArgumentNullException(nameof(logger));
m_telemetry = telemetry ?? throw new ArgumentNullException(nameof(telemetry));
}
/// <summary>
/// Subscribes to alarm events from the Server notifier and prints
/// a typed summary for each received alarm record.
/// </summary>
/// <param name="session">An active managed session.</param>
/// <param name="durationMs">How long to listen for alarms.</param>
/// <param name="ct">Cancellation token.</param>
/// <exception cref="ArgumentNullException"><paramref name="session"/> is <c>null</c>.</exception>
public async Task SubscribeToAlarmsAsync(
ManagedSession session,
int durationMs,
CancellationToken ct = default)
{
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
Console.WriteLine("Subscribing to alarms via streaming subscription...");
using var timeout = CancellationTokenSource.CreateLinkedTokenSource(ct);
timeout.CancelAfter(durationMs);
IStreamingSubscription streaming = session.DefaultStreaming;
try
{
await foreach (ConditionTypeRecord record in streaming
.SubscribeAlarmsAsync(ObjectIds.Server, ct: timeout.Token)
.ConfigureAwait(false))
{
PrintAlarm(record);
}
}
catch (OperationCanceledException)
{
Console.WriteLine("Alarm subscription window elapsed.");
}
}
/// <summary>
/// Demonstrates acknowledging an alarm by EventId after waiting
/// for an active record using the TakeUntilAsync helper.
/// </summary>
/// <exception cref="ArgumentNullException"><paramref name="session"/> is <c>null</c>.</exception>
public async Task WaitForAndAcknowledgeAsync(
ManagedSession session,
NodeId conditionId,
CancellationToken ct = default)
{
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
AlarmClient alarms = session.GetAlarmClient(m_telemetry);
IStreamingSubscription streaming = session.DefaultStreaming;
Console.WriteLine($"Waiting for next active record from {conditionId}...");
await foreach (ConditionTypeRecord record in streaming
.SubscribeAlarmsAsync(ObjectIds.Server, ct: ct)
.TakeUntilAsync(r =>
r is AlarmConditionTypeRecord ar &&
ar.ConditionId == conditionId &&
ar.ActiveStateId == true, ct)
.ConfigureAwait(false))
{
if (record is AlarmConditionTypeRecord alarm &&
alarm.ConditionId == conditionId &&
alarm.ActiveStateId == true)
{
Console.WriteLine($"Acknowledging {alarm.ConditionName} EventId {alarm.EventId}");
try
{
await alarms.AcknowledgeAsync(
alarm.ConditionId,
alarm.EventId,
new LocalizedText("en", "Acknowledged by sample"),
ct).ConfigureAwait(false);
Console.WriteLine("Acknowledge succeeded.");
}
catch (Exception ex)
{
m_logger.AcknowledgeFailed(ex);
}
}
}
}
/// <summary>
/// Demonstrates calling shelving methods on an alarm.
/// </summary>
/// <exception cref="ArgumentNullException"><paramref name="session"/> is <c>null</c>.</exception>
public async Task ShelveAlarmAsync(
ManagedSession session,
NodeId conditionId,
double shelvingTimeMs,
CancellationToken ct = default)
{
if (session == null)
{
throw new ArgumentNullException(nameof(session));
}
AlarmClient alarms = session.GetAlarmClient(m_telemetry);
Console.WriteLine($"Shelving {conditionId} for {shelvingTimeMs}ms...");
await alarms.TimedShelveAsync(conditionId, shelvingTimeMs, ct).ConfigureAwait(false);
Console.WriteLine("Alarm shelved.");
}
private static void PrintAlarm(ConditionTypeRecord record)
{
switch (record)
{
case AlarmConditionTypeRecord alarm:
Console.WriteLine(
$"[ALARM] {alarm.SourceName} sev={alarm.Severity} " +
$"active={alarm.ActiveStateId} acked={alarm.AckedStateId} " +
$"suppressed={alarm.SuppressedStateId} latched={alarm.LatchedStateId}");
break;
case DialogConditionTypeRecord dialog:
Console.WriteLine(
$"[DIALOG] {dialog.SourceName} prompt='{dialog.Prompt}' " +
$"options={dialog.ResponseOptionSet?.Length ?? 0}");
break;
case AcknowledgeableConditionTypeRecord ack:
Console.WriteLine(
$"[CONDITION] {ack.SourceName} sev={ack.Severity} acked={ack.AckedStateId}");
break;
default:
Console.WriteLine(
$"[CONDITION] {record.SourceName} sev={record.Severity}");
break;
}
}
}
internal static partial class AlarmClientSampleLog
{
[LoggerMessage(EventId = ConsoleReferenceClientEventIds.AlarmClientSample + 0, Level = LogLevel.Error,
Message = "Acknowledge failed")]
public static partial void AcknowledgeFailed(this ILogger logger, Exception ex);
}
}