mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
# Description PR #4194 removed the unused `ServerConfiguration.MinMetadataSamplingInterval` and left nothing in its place. As a result there was no way to populate `Server.ServerCapabilities.MinSupportedSampleRate` (`i=2272`) — `ServerInternalData.CreateServerObjectAsync` hardcoded it to `0`. Separately, the only clamp applied when revising a monitored item's sampling interval was the per-node `BaseVariableState.MinimumSamplingInterval`, which defaults to `MinimumSamplingIntervals.Continuous` (`0`), so reference-server nodes accepted any requested interval (e.g. 10 ms) unrevised — exactly what was reported. This adds a configuration entry **in the exact schema slot #4194 vacated** and enforces it as a lower bound. ## Configuration - **`ServerConfiguration.MinSupportedSamplingInterval`** — `double` (milliseconds), default `0`, `[DataTypeField(Order = 17)]`, i.e. between `MaxNotificationsPerPublish` (16) and `AvailableSamplingRates` (18). - `ApplicationConfiguration.xsd` — `<xs:element name="MinSupportedSamplingInterval" type="xs:double" minOccurs="0" />` in the same position the removed element occupied. - Fluent API **`SetMinSupportedSamplingInterval(double)`** on `IApplicationConfigurationBuilderServerOptions`, in the place `SetMinMetadataSamplingInterval` was removed from. - The element is added to the six config XML files #4194 touched (reference / CTT / AOT / GDS use `0`; `test-server-full.xml` uses a distinctive non-zero value for the round-trip test). The address-space Property keeps its OPC UA spec name, so `Server.ServerCapabilities.MinSupportedSampleRate` and `VariableIds.Server_ServerCapabilities_MinSupportedSampleRate` are unchanged. ```xml <MaxNotificationsPerPublish>1000</MaxNotificationsPerPublish> <MinSupportedSamplingInterval>2000</MinSupportedSamplingInterval> <AvailableSamplingRates> ``` ```csharp application.Build(applicationUri, productUri) .AsServer([endpointUrl]) .SetMinSupportedSamplingInterval(2000); ``` ## Behavior - `ServerInternalData` now publishes the configured value to `Server.ServerCapabilities.MinSupportedSampleRate`. - New `SubscriptionManager.CalculateRevisedSamplingInterval(...)` (two overloads, alongside the existing `CalculateRevisedQueueSize`) centralizes the revision rule and replaces the logic that was duplicated across four call sites — the create and modify paths of `AsyncCustomNodeManager` and `CustomNodeManager` — which now expose a `MinSupportedSamplingInterval` property seeded from the configuration (mirroring how `MaxQueueSize` is initialized). The rule: 1. A requested interval below zero resolves to the *default sampling interval*: the **publishing interval of the subscription** on create, and the item's **current sampling interval** on modify. The modify case preserves 1.5.378 behavior, so a `ModifyMonitoredItems` call that leaves the sampling interval unspecified does not silently retune the item. 2. A node declaring `MinimumSamplingIntervals.Continuous` (`0`) for the `Value` Attribute reports **by exception** and is **not** bound by the server-wide minimum — the requested interval is returned unchanged. 3. Every other item is raised to `max(nodeMinimumSamplingInterval, MinSupportedSamplingInterval)`. Attributes other than `Value`, nodes declaring `MinimumSamplingIntervals.Indeterminate` (`-1`), and non-Variable nodes are bound only by `MinSupportedSamplingInterval`. 4. `double.MaxValue` is capped to one year (pre-existing behavior, now in one place). Event monitored items do not sample and are unaffected. **Backward compatible:** with the default of `0` the computation is identical to the previous code for every input, including `Continuous`, `Indeterminate`, positive node minimums, non-`Value` attributes and `NaN`. No existing configuration or deployment changes behavior. Node managers that implement `INodeManager` directly can call the new public helper to apply the same rule. ## Related Issues - Fixes #4191 The issue thread also asked whether `Subscription.MaxNotificationsPerPublish` is revised by the server. It is (`SubscriptionManager.CalculateMaxNotificationsPerPublish`), but it was untested and is not observable from the `CreateSubscription` response, which carries no revised field for that parameter. Four tests were added that assert it through `SubscriptionDiagnostics.MaxNotificationsPerPublish` on a privileged session, covering create and modify, the above-limit, below-limit and `0` (server default) cases. ## Tests - **`SamplingIntervalRevisionTests`** (17 unit tests, `Opc.Ua.Server.Tests`) — the full revision matrix: negative request resolving to the default interval, the `Continuous` bypass, `Indeterminate`, node minimum above *and* below the floor, a floor of `0` being a no-op, non-`Value` attributes, non-Variable and null nodes, and the `double.MaxValue` cap. - **`MinSupportedSamplingIntervalTests`** (10 integration tests, `Opc.Ua.Subscriptions.Tests`) — against a reference server configured with a 500 ms floor: the capabilities node reflects the configuration; a node declaring 100 ms is lifted to 500 ms; `Scalar_Static_Arrays2D_LocalizedText` (1000 ms) wins over the floor; `CurrentTime` (250 ms) is lifted; a `Continuous` node keeps its 10 ms; a non-`Value` attribute is floored; `ModifyMonitoredItems` behaves the same in both directions; event items are unaffected. - Restored the configuration builder and round-trip test coverage that #4194 deleted. - `TestFixture` gained a `protected virtual void ConfigureServer(ApplicationConfiguration)` hook so a derived fixture can vary the server configuration before start. Default implementation is a no-op, so no existing fixture changes behavior. ## Documentation - `docs/Subscriptions.md` — new **Sampling interval revision** section with the input table, the four-step rule (including both negative-interval fallbacks), XML and fluent configuration examples, and guidance for custom node managers. - `docs/migrate/2.0.x/configuration.md` — new section documenting that `MinMetadataSamplingInterval` was removed and `MinSupportedSamplingInterval` added. Verified against `master378`: the old setting defaulted to `1000` but was never read, and `MinSupportedSampleRate` was hardcoded to `0` with no server-wide floor. The guide therefore stresses that these are **two different settings, not a rename** — consumers should drop the old element (a default of `0` reproduces 1.5.378 exactly) and only opt into the new one deliberately, since reusing the old value would silently introduce a sampling floor. ## Validation - `dotnet build UA.slnx` — **0 warnings, 0 errors** across all TFMs. - .NET 10: `Opc.Ua.Server.Tests` 4091 passed, `Opc.Ua.Subscriptions.Tests` 619 passed (full suite including the new fixture), `Opc.Ua.InformationModel.Tests` 1063 passed, `Opc.Ua.Configuration.Tests` 221 passed, `Opc.Ua.Gds.Tests` 119 passed. - .NET Framework 4.8: new unit tests (200 incl. sampling groups), new integration tests (17) and configuration round-trip (135) all passed. - `ConsoleReferenceServer` starts successfully with the updated configuration file. ## 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. - [x] 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. - [x] I have addressed **all** PR feedback received. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 79f8090c-b2a3-409c-a5bf-56b6d2a35e70
363 lines
14 KiB
C#
363 lines
14 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.Threading;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Client.TestFramework;
|
|
|
|
namespace Opc.Ua.Subscriptions.Tests
|
|
{
|
|
/// <summary>
|
|
/// Integration tests for the server wide MinSupportedSamplingInterval configuration option
|
|
/// and its interplay with the MinimumSamplingInterval declared by a node. The fixture
|
|
/// starts a reference server that advertises a non-zero minimum supported sampling interval.
|
|
/// </summary>
|
|
[NonParallelizable]
|
|
[TestFixture]
|
|
[Category("Subscription")]
|
|
[Category("MonitoredItem")]
|
|
[Category("MinSupportedSamplingInterval")]
|
|
public class MinSupportedSamplingIntervalTests : TestFixture
|
|
{
|
|
/// <summary>
|
|
/// Chosen so that it is above the MinimumSamplingInterval of
|
|
/// <c>Scalar_Static_Float</c> (100 ms) and below the MinimumSamplingInterval of
|
|
/// <c>Server.ServerStatus.CurrentTime</c> (1000 ms), which lets a single server
|
|
/// cover both directions of the interplay.
|
|
/// </summary>
|
|
private const double kMinSupportedSamplingInterval = 500;
|
|
|
|
private const double kNodeMinimumAboveFloor = 1000;
|
|
private const double kRequestedBelowFloor = 10;
|
|
private const double kPublishingInterval = 1000;
|
|
|
|
protected override void ConfigureServer(ApplicationConfiguration configuration)
|
|
{
|
|
configuration.ServerConfiguration.MinSupportedSamplingInterval = kMinSupportedSamplingInterval;
|
|
}
|
|
|
|
[SetUp]
|
|
public async Task SetUp()
|
|
{
|
|
m_subscriptionId = await CreateSetupSubscriptionAsync(
|
|
publishingInterval: kPublishingInterval,
|
|
requestedLifetimeCount: 100,
|
|
requestedMaxKeepAliveCount: 10).ConfigureAwait(false);
|
|
}
|
|
|
|
[TearDown]
|
|
public async Task TearDown()
|
|
{
|
|
if (m_subscriptionId > 0)
|
|
{
|
|
await Session.DeleteSubscriptionsAsync(
|
|
null,
|
|
new uint[] { m_subscriptionId }.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
m_subscriptionId = 0;
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServerCapabilitiesReportsConfiguredMinSupportedSamplingIntervalAsync()
|
|
{
|
|
ReadResponse response = await Session.ReadAsync(
|
|
null,
|
|
0,
|
|
TimestampsToReturn.Neither,
|
|
new ReadValueId[]
|
|
{
|
|
new()
|
|
{
|
|
NodeId = VariableIds.Server_ServerCapabilities_MinSupportedSampleRate,
|
|
AttributeId = Attributes.Value
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
response.Results[0].WrappedValue.GetDouble(),
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"MinSupportedSamplingInterval must reflect the configured value.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task SamplingIntervalBelowMinSupportedSamplingIntervalIsRevisedAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"The server wide minimum must raise a node minimum of 100 ms to 500 ms.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task NodeMinimumSamplingIntervalAboveFloorWinsAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(
|
|
new ExpandedNodeId(
|
|
"Scalar_Static_Arrays2D_LocalizedText",
|
|
Constants.ReferenceServerNamespaceUri));
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kNodeMinimumAboveFloor),
|
|
"A node minimum above the server wide minimum must win.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task ServerStatusCurrentTimeIsRaisedToMinSupportedSamplingIntervalAsync()
|
|
{
|
|
// the reference server declares a MinimumSamplingInterval of 250 ms for
|
|
// CurrentTime, which is below the configured minimum supported sampling interval.
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
VariableIds.Server_ServerStatus_CurrentTime,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ContinuousNodeBypassesMinSupportedSamplingIntervalAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor),
|
|
"Nodes that report by exception are not bound by the minimum supported sampling interval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task NonValueAttributeIsBoundByMinSupportedSamplingIntervalAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
kRequestedBelowFloor,
|
|
attributeId: Attributes.DisplayName).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval),
|
|
"Attributes other than Value do not declare a MinimumSamplingInterval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task SamplingIntervalAboveMinSupportedSamplingIntervalIsKeptAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(result.RevisedSamplingInterval, Is.EqualTo(5000.0));
|
|
}
|
|
|
|
[Test]
|
|
public async Task NegativeSamplingIntervalUsesPublishingIntervalAndFloorAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
nodeId,
|
|
-1).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kPublishingInterval),
|
|
"A negative sampling interval resolves to the publishing interval.");
|
|
}
|
|
|
|
[Test]
|
|
public async Task ModifyMonitoredItemBelowMinSupportedSamplingIntervalIsRevisedAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticFloat);
|
|
|
|
MonitoredItemCreateResult createResult = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(createResult.StatusCode), Is.True);
|
|
|
|
ModifyMonitoredItemsResponse modifyResponse = await Session.ModifyMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemModifyRequest[]
|
|
{
|
|
new()
|
|
{
|
|
MonitoredItemId = createResult.MonitoredItemId,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = kRequestedBelowFloor,
|
|
QueueSize = 10,
|
|
DiscardOldest = true
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(modifyResponse.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
modifyResponse.Results[0].RevisedSamplingInterval,
|
|
Is.EqualTo(kMinSupportedSamplingInterval));
|
|
}
|
|
|
|
[Test]
|
|
public async Task ModifyMonitoredItemOnContinuousNodeBypassesFloorAsync()
|
|
{
|
|
NodeId nodeId = ToNodeId(Constants.ScalarStaticInt32);
|
|
|
|
MonitoredItemCreateResult createResult = await CreateItemAsync(
|
|
nodeId,
|
|
5000).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(createResult.StatusCode), Is.True);
|
|
|
|
ModifyMonitoredItemsResponse modifyResponse = await Session.ModifyMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemModifyRequest[]
|
|
{
|
|
new()
|
|
{
|
|
MonitoredItemId = createResult.MonitoredItemId,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = kRequestedBelowFloor,
|
|
QueueSize = 10,
|
|
DiscardOldest = true
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(modifyResponse.Results[0].StatusCode), Is.True);
|
|
Assert.That(
|
|
modifyResponse.Results[0].RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor));
|
|
}
|
|
|
|
[Test]
|
|
public async Task EventMonitoredItemIsNotBoundByMinSupportedSamplingIntervalAsync()
|
|
{
|
|
var filter = new EventFilter();
|
|
filter.AddSelectClause(
|
|
ObjectTypeIds.BaseEventType,
|
|
QualifiedName.From(BrowseNames.EventId));
|
|
filter.AddSelectClause(
|
|
ObjectTypeIds.BaseEventType,
|
|
QualifiedName.From(BrowseNames.Message));
|
|
|
|
MonitoredItemCreateResult result = await CreateItemAsync(
|
|
ObjectIds.Server,
|
|
kRequestedBelowFloor,
|
|
attributeId: Attributes.EventNotifier,
|
|
filter: new ExtensionObject(filter)).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(result.StatusCode), Is.True);
|
|
Assert.That(
|
|
result.RevisedSamplingInterval,
|
|
Is.EqualTo(kRequestedBelowFloor),
|
|
"Event monitored items are not bound by the minimum supported sampling interval.");
|
|
}
|
|
|
|
private async Task<MonitoredItemCreateResult> CreateItemAsync(
|
|
NodeId nodeId,
|
|
double samplingInterval,
|
|
uint attributeId = Attributes.Value,
|
|
ExtensionObject filter = default)
|
|
{
|
|
CreateMonitoredItemsResponse response = await Session.CreateMonitoredItemsAsync(
|
|
null,
|
|
m_subscriptionId,
|
|
TimestampsToReturn.Both,
|
|
new MonitoredItemCreateRequest[]
|
|
{
|
|
new()
|
|
{
|
|
ItemToMonitor = new ReadValueId
|
|
{
|
|
NodeId = nodeId,
|
|
AttributeId = attributeId
|
|
},
|
|
MonitoringMode = MonitoringMode.Reporting,
|
|
RequestedParameters = new MonitoringParameters
|
|
{
|
|
ClientHandle = 1,
|
|
SamplingInterval = samplingInterval,
|
|
Filter = filter,
|
|
DiscardOldest = true,
|
|
QueueSize = 10
|
|
}
|
|
}
|
|
}.ToArrayOf(),
|
|
CancellationToken.None).ConfigureAwait(false);
|
|
|
|
Assert.That(StatusCode.IsGood(response.ResponseHeader.ServiceResult), Is.True);
|
|
Assert.That(response.Results.Count, Is.EqualTo(1));
|
|
|
|
return response.Results[0];
|
|
}
|
|
|
|
private uint m_subscriptionId;
|
|
}
|
|
}
|