Files
UA-.NETStandard/Libraries/Opc.Ua.Client/Subscription/Streaming/StreamingSubscriptionExtensions.cs
Marc Schier dbc09b8e22 Adopt System.TimeProvider across the stack (fixes #2458) (#3829)
# Description

Adopt
[`System.TimeProvider`](https://learn.microsoft.com/dotnet/api/system.timeprovider)
across the stack so that every place that creates timers, runs duration
math, or schedules periodic work is mockable, deterministic in tests,
and immune to wall-clock changes.

The migration touches Core, Core.Types, Server, Client, PubSub,
Configuration, Gds (server + client), Lds, and the Quickstarts/Console
reference apps. Per-component changes follow the same pattern:

1. Add a `private readonly TimeProvider m_timeProvider;` field.
2. Accept a nullable `TimeProvider? timeProvider = null` as the **last**
constructor parameter (new overload; legacy constructor stays for binary
compatibility and delegates with `timeProvider: null`).
3. Initialise the field with `m_timeProvider = timeProvider ??=
TimeProvider.System;`.
4. Replace `new Timer(...)`, `Stopwatch`, `HiResClock.*`,
`DateTime.UtcNow`-based duration math, and `Task.Delay(delay, ct)` in
timing loops with the matching `m_timeProvider` API (`CreateTimer`,
`GetTimestamp` / `GetElapsedTime`, `GetUtcNow().UtcDateTime`,
`Task.Delay(delay, m_timeProvider, ct)`).
5. Wire the provider through DI: `AddOpcUaServerBuilder` /
`AddOpcUaClientBuilder` register `TimeProvider.System` via
`TryAddSingleton<TimeProvider>()` so tests can swap in
`Microsoft.Extensions.Time.Testing.FakeTimeProvider`.

`HiResClock` itself is kept (so the
`ApplicationConfiguration.DisableHiResClock` schema flag still
round-trips), but **every public member** is now `[Obsolete]` with a
single shared message pointing to the new migration-guide section. The
few internal call sites that still need to set/read `HiResClock` are
wrapped with `#pragma warning disable CS0618`.

### Highlights per component

- **Core / Stack** — `Opc.Ua.Core`, `Opc.Ua.Core.Types`, channel
pipeline (`UaSCBinaryClientChannel`, `ChannelToken`,
`UaSCBinaryChannel`), `ApplicationConfiguration`, certificate
validators, `JwksIssuerKeyResolver`, `TimeProviderExtensions` polyfills
(`GetTimestampMilliseconds`, `GetTickCount`,
`CancellationTokenSource(timeout, timeProvider)`, `Task.Delay(delay,
provider, ct)` polyfill for older TFMs).
- **Server** — session lockout, subscription pipeline
(publish/sample/keep-alive/lifetime), `MonitoredItemQueue`, alarm
sampling rate, `IntervalRunner`, server diagnostics, configuration state
machines, hosted services.
- **Client** — `Session`, managed/V2 subscription engines, reconnect
handlers, channel keep-alive, periodic publishing, complex-type
discovery polling.
- **PubSub** — `IntervalRunner` pipeline, message-receive timers,
MQTT/UDP keep-alive, publishers/readers.
- **Gds / Lds** — `LdsServer`, `LinqApplicationsDatabase` expiry
housekeeping, GDS clients (push, pull), `DirectoryCertificateStore`,
`ConnectionStateMachine`, classic subscription engine.
- **Quickstarts / Console samples** — `SampleNodeManager`,
`ReferenceNodeManager`, `AlarmNodeManager`, `BoilerState`,
`MemoryBufferState`, `PublishedValuesWrites`. Samples resolve via
`(Server as ITimeProviderProvider)?.TimeProvider ?? TimeProvider.System`
so existing ctor signatures stay binary-compatible.
- **Tests** — `Opc.Ua.PubSub.Tests` adds `IntervalRunnerTests`; existing
`SubscriptionTests`, `UaPublisherTests`, and `TestDataSystem` move off
`HiResClock`. Added `Microsoft.Extensions.TimeProvider.Testing` package
for `FakeTimeProvider` (project-load warning surfaces on net48/net472
only — runtime is .NET 8+).

### Migration guide

New section [**Time and Timer abstraction
(`TimeProvider`)**](Docs/MigrationGuide.md#time-and-timer-abstraction-timeprovider)
documents:

- The canonical replacement table (`HiResClock.UtcNow` →
`timeProvider.GetUtcNow().UtcDateTime`, `HiResClock.TickCount64` →
`timeProvider.GetTimestamp()`, `new Timer` → `timeProvider.CreateTimer`,
`Task.Delay(delay, ct)` → `Task.Delay(delay, timeProvider, ct)`, …).
- The `TimeProvider? timeProvider = null` + `??=` constructor pattern.
- DI wiring and how to swap in `FakeTimeProvider` in tests.
- Before/after snippets for `HiResClock.TickCount64`,
`HiResClock.UtcNow`, and `new Timer(...)`.

## Related Issues

- Fixes #2458

## Checklist

- [x] 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.
- [ ] I ran **all** tests locally using the **UA.slnx** solution against
at least .net **framework** and .net **10**, and all passed.
- [ ] I fixed **all** failing and flaky tests in the CI pipelines and
**all** CodeQL warnings.
- [ ] I have addressed **all** PR feedback received.
2026-06-03 22:38:32 +02:00

241 lines
9.1 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.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
namespace Opc.Ua.Client.Subscriptions.Streaming
{
/// <summary>
/// Extensions on <see cref="IAsyncEnumerable{T}"/> useful for
/// short-lived subscriptions tracking state-machine transitions
/// or bounded observation windows.
/// </summary>
/// <remarks>
/// These helpers exist alongside (but do not replace) the
/// equivalents in <c>System.Linq.Async</c> because their semantics
/// are tuned for OPC UA subscribe-and-wait scenarios and differ
/// from the standard LINQ operators:
/// <list type="bullet">
/// <item><see cref="TakeUntilAsync{T}"/> is <em>inclusive</em> of
/// the matching item (yields it last), unlike
/// <c>System.Linq.Async.TakeWhile</c> which stops just before
/// the matching item.</item>
/// <item><see cref="WithTimeoutAsync{T}"/> completes the
/// enumeration <em>silently</em> on timeout instead of
/// throwing, so callers can use it as a bounded observation
/// window without needing a try/catch around the await foreach.</item>
/// <item><see cref="BufferedAsync{T}"/> yields fixed-size
/// chunks; the trailing partial chunk (if the source ends with
/// fewer items) is yielded too.</item>
/// </list>
/// Adding a dependency on <c>System.Linq.Async</c> just to swap
/// these out would force a single-implementation choice; keeping
/// these here lets the stack own the semantics callers depend on.
/// </remarks>
public static class StreamingSubscriptionExtensions
{
/// <summary>
/// Yields items until the predicate returns <c>true</c>. The
/// matching item is yielded last, then enumeration stops.
/// Useful for waiting on a specific state transition.
/// </summary>
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
public static IAsyncEnumerable<T> TakeUntilAsync<T>(
this IAsyncEnumerable<T> source,
Func<T, bool> predicate,
CancellationToken ct = default)
{
if (source == null)
{
throw new ArgumentNullException(nameof(source));
}
if (predicate == null)
{
throw new ArgumentNullException(nameof(predicate));
}
return TakeUntilImpl(source, predicate, ct);
}
private static async IAsyncEnumerable<T> TakeUntilImpl<T>(
IAsyncEnumerable<T> source,
Func<T, bool> predicate,
[EnumeratorCancellation] CancellationToken ct)
{
await foreach (T item in source.ConfigureAwait(false))
{
ct.ThrowIfCancellationRequested();
yield return item;
if (predicate(item))
{
yield break;
}
}
}
/// <summary>
/// Yields items until the timeout elapses. The enumeration
/// completes silently when the timeout expires.
/// </summary>
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
/// <param name="source">The source sequence.</param>
/// <param name="timeout">The timeout duration.</param>
/// <param name="timeProvider">
/// Optional <see cref="TimeProvider"/> used for the timeout
/// scheduler; defaults to <see cref="TimeProvider.System"/>.
/// </param>
/// <param name="ct">Cancellation token.</param>
public static IAsyncEnumerable<T> WithTimeoutAsync<T>(
this IAsyncEnumerable<T> source,
TimeSpan timeout,
TimeProvider? timeProvider = null,
CancellationToken ct = default)
{
if (source == null)
{
throw new ArgumentNullException(nameof(source));
}
return WithTimeoutImpl(source, timeout, timeProvider ?? TimeProvider.System, ct);
}
private static async IAsyncEnumerable<T> WithTimeoutImpl<T>(
IAsyncEnumerable<T> source,
TimeSpan timeout,
TimeProvider timeProvider,
[EnumeratorCancellation] CancellationToken ct)
{
using CancellationTokenSource timeoutCts = timeProvider
.CreateCancellationTokenSource(timeout);
using var cts = CancellationTokenSource.CreateLinkedTokenSource(ct, timeoutCts.Token);
IAsyncEnumerator<T> enumerator =
source.GetAsyncEnumerator(cts.Token);
try
{
while (true)
{
bool hasNext;
try
{
hasNext = await enumerator.MoveNextAsync().ConfigureAwait(false);
}
catch (OperationCanceledException) when (cts.IsCancellationRequested && !ct.IsCancellationRequested)
{
yield break;
}
if (!hasNext)
{
yield break;
}
yield return enumerator.Current;
}
}
finally
{
await enumerator.DisposeAsync().ConfigureAwait(false);
}
}
/// <summary>
/// Yields exactly <paramref name="count"/> items then completes.
/// </summary>
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
public static IAsyncEnumerable<T> TakeAsync<T>(
this IAsyncEnumerable<T> source,
int count,
CancellationToken ct = default)
{
if (source == null)
{
throw new ArgumentNullException(nameof(source));
}
if (count <= 0)
{
throw new ArgumentOutOfRangeException(nameof(count));
}
return TakeImpl(source, count, ct);
}
private static async IAsyncEnumerable<T> TakeImpl<T>(
IAsyncEnumerable<T> source,
int count,
[EnumeratorCancellation] CancellationToken ct)
{
int taken = 0;
await foreach (T item in source.ConfigureAwait(false))
{
ct.ThrowIfCancellationRequested();
yield return item;
if (++taken >= count)
{
yield break;
}
}
}
/// <summary>
/// Buffers the first <paramref name="count"/> items into a
/// list and returns it.
/// </summary>
/// <typeparam name="T">The type of items in the source sequence.</typeparam>
public static async System.Threading.Tasks.ValueTask<IReadOnlyList<T>> BufferedAsync<T>(
this IAsyncEnumerable<T> source,
int count,
CancellationToken ct = default)
{
if (source == null)
{
throw new ArgumentNullException(nameof(source));
}
if (count <= 0)
{
throw new ArgumentOutOfRangeException(nameof(count));
}
var buffer = new List<T>(count);
await foreach (T item in source.ConfigureAwait(false))
{
ct.ThrowIfCancellationRequested();
buffer.Add(item);
if (buffer.Count >= count)
{
break;
}
}
return buffer;
}
}
}