mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +08:00
d7dd1b0369
# Description Telemetry extensions resolved meters and activity sources as `Opc.Ua.Types`, with results dependent on helper inlining. This prevented reliable attribution to the emitting component. - **Existing telemetry contract**: Add `CreateMeter(Assembly)` and `GetActivitySource(Assembly)` directly to `ITelemetryContext`. The separate `IAssemblyTelemetryContext` interface has been removed. - **Reliable component attribution**: Capture the caller assembly in non-inlined `CreateMeter`, `GetActivitySource`, and `StartActivity` extensions, then forward it to the existing telemetry context. - **Call-site routing and fallback**: Keep non-null meter calls on `telemetry.CreateMeter()`. Use explicit `TelemetryExtensions.CreateMeter(telemetry)` for nullable-context fallback. Preserve default meter/activity-source fallback when a context returns null. - **Coverage and documentation**: Cover caller-assembly naming, direct-context and extension routing, activity creation, and null-result fallback. Update diagnostics examples, OpenTelemetry filters, and migration guidance. **Compatibility:** Direct implementations of `ITelemetryContext` must implement the two new assembly-aware members. `TelemetryContextBase` supplies both. This interface addition is documented in the 2.0 migration guide; legacy implementer compatibility is not claimed. ## Local validation The Release build and focused `TelemetryExtensionsTests` fixture pass on both target frameworks: | Target | Result | | --- | --- | | net10.0 | Passed: 6, Failed: 0, Skipped: 0 | | net48 | Passed: 6, Failed: 0, Skipped: 0 | Both builds emit existing CA5394 warnings in `NodeStateChildNameIndexTests.cs`, which is unchanged by this PR. The full solution test suite was not run during this feedback pass. ## Related Issues ## 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. - [ ] 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. <!-- START COPILOT CODING AGENT SUFFIX --> - Fixes #4483 --------- 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 <marcschier@users.noreply.github.com>
286 lines
10 KiB
C#
286 lines
10 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.Diagnostics;
|
|
using System.Diagnostics.Metrics;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using Microsoft.Extensions.Diagnostics.Metrics;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Bindings;
|
|
|
|
namespace Opc.Ua.Core.Tests.Stack.Diagnostics
|
|
{
|
|
/// <summary>
|
|
/// Tests for the root <c>services.AddOpcUa()</c> entry point and the
|
|
/// fluent <see cref="IOpcUaBuilder"/> extensions in
|
|
/// <c>Opc.Ua.Core</c>.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Core")]
|
|
[Parallelizable]
|
|
public sealed class OpcUaServiceCollectionExtensionsTests
|
|
{
|
|
[Test]
|
|
public void AddOpcUaThrowsForNullServices()
|
|
{
|
|
Assert.That(
|
|
() => OpcUaServiceCollectionExtensions.AddOpcUa(null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaReturnsBuilderWithServices()
|
|
{
|
|
var services = new ServiceCollection();
|
|
|
|
IOpcUaBuilder builder = services.AddOpcUa();
|
|
|
|
Assert.That(builder, Is.Not.Null);
|
|
Assert.That(builder.Services, Is.SameAs(services));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaIsIdempotentForTelemetry()
|
|
{
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddOpcUa();
|
|
int afterFirst = CountDescriptorsFor<ITelemetryContext>(services);
|
|
services.AddOpcUa();
|
|
int afterSecond = CountDescriptorsFor<ITelemetryContext>(services);
|
|
|
|
Assert.That(afterFirst, Is.EqualTo(1));
|
|
Assert.That(afterSecond, Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaIsIdempotentForBufferManagerFactory()
|
|
{
|
|
var services = new ServiceCollection();
|
|
|
|
services.AddOpcUa();
|
|
int factoriesAfterFirst = CountDescriptorsFor<IBufferManagerFactory>(services);
|
|
int optionsAfterFirst = CountDescriptorsFor<BufferManagerFactoryOptions>(services);
|
|
services.AddOpcUa();
|
|
|
|
Assert.That(factoriesAfterFirst, Is.EqualTo(1));
|
|
Assert.That(optionsAfterFirst, Is.EqualTo(1));
|
|
Assert.That(CountDescriptorsFor<IBufferManagerFactory>(services), Is.EqualTo(1));
|
|
Assert.That(CountDescriptorsFor<BufferManagerFactoryOptions>(services), Is.EqualTo(1));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDoesNotOverrideExistingBufferManagerFactory()
|
|
{
|
|
var services = new ServiceCollection();
|
|
var custom = new BufferManagerFactoryStub();
|
|
services.AddSingleton<IBufferManagerFactory>(custom);
|
|
|
|
services.AddOpcUa();
|
|
|
|
using ServiceProvider provider = services.BuildServiceProvider();
|
|
Assert.That(provider.GetRequiredService<IBufferManagerFactory>(), Is.SameAs(custom));
|
|
}
|
|
|
|
[Test]
|
|
public void AddOpcUaDoesNotOverrideExistingTelemetryContext()
|
|
{
|
|
var services = new ServiceCollection();
|
|
ITelemetryContext custom = new TelemetryContextStub();
|
|
services.AddSingleton(custom);
|
|
|
|
services.AddOpcUa();
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
ITelemetryContext resolved = sp.GetRequiredService<ITelemetryContext>();
|
|
Assert.That(resolved, Is.SameAs(custom));
|
|
}
|
|
|
|
[Test]
|
|
public void TelemetryContextResolvesHostLoggerFactory()
|
|
{
|
|
var services = new ServiceCollection();
|
|
using ILoggerFactory hostFactory = LoggerFactory.Create(b => b.AddDebug());
|
|
services.AddSingleton(hostFactory);
|
|
|
|
services.AddOpcUa();
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
ITelemetryContext telemetry = sp.GetRequiredService<ITelemetryContext>();
|
|
Assert.That(telemetry, Is.InstanceOf<ServiceProviderTelemetryContext>());
|
|
Assert.That(telemetry.LoggerFactory, Is.SameAs(hostFactory));
|
|
}
|
|
|
|
[Test]
|
|
public void TelemetryContextFallsBackToNullLoggerFactory()
|
|
{
|
|
var services = new ServiceCollection();
|
|
services.AddOpcUa();
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
ITelemetryContext telemetry = sp.GetRequiredService<ITelemetryContext>();
|
|
Assert.That(telemetry, Is.InstanceOf<ServiceProviderTelemetryContext>());
|
|
Assert.That(telemetry.LoggerFactory, Is.SameAs(NullLoggerFactory.Instance));
|
|
}
|
|
|
|
[Test]
|
|
public void AddLoggingChainsToOpcUaBuilder()
|
|
{
|
|
var services = new ServiceCollection();
|
|
|
|
IOpcUaBuilder result = services.AddOpcUa().AddLogging();
|
|
|
|
Assert.That(result, Is.Not.Null);
|
|
Assert.That(result.Services, Is.SameAs(services));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
Assert.That(sp.GetService<ILoggerFactory>(), Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddLoggingWithConfigureChainsToOpcUaBuilder()
|
|
{
|
|
var services = new ServiceCollection();
|
|
bool called = false;
|
|
|
|
IOpcUaBuilder result = services.AddOpcUa()
|
|
.AddLogging(b =>
|
|
{
|
|
called = true;
|
|
b.SetMinimumLevel(LogLevel.Warning);
|
|
});
|
|
|
|
Assert.That(called, Is.True);
|
|
Assert.That(result, Is.Not.Null);
|
|
Assert.That(result.Services, Is.SameAs(services));
|
|
|
|
using ServiceProvider sp = services.BuildServiceProvider();
|
|
Assert.That(sp.GetService<ILoggerFactory>(), Is.Not.Null);
|
|
}
|
|
|
|
[Test]
|
|
public void AddMetricsChainsToOpcUaBuilder()
|
|
{
|
|
var services = new ServiceCollection();
|
|
|
|
IOpcUaBuilder result = services.AddOpcUa().AddMetrics();
|
|
|
|
Assert.That(result, Is.Not.Null);
|
|
Assert.That(result.Services, Is.SameAs(services));
|
|
}
|
|
|
|
[Test]
|
|
public void AddLoggingNullArgsThrow()
|
|
{
|
|
Assert.That(
|
|
() => OpcUaServiceCollectionExtensions.AddLogging(null!),
|
|
Throws.ArgumentNullException);
|
|
|
|
var services = new ServiceCollection();
|
|
IOpcUaBuilder builder = services.AddOpcUa();
|
|
Assert.That(
|
|
() => builder.AddLogging((Action<ILoggingBuilder>)null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void AddMetricsNullArgsThrow()
|
|
{
|
|
Assert.That(
|
|
() => OpcUaServiceCollectionExtensions.AddMetrics(null!),
|
|
Throws.ArgumentNullException);
|
|
|
|
var services = new ServiceCollection();
|
|
IOpcUaBuilder builder = services.AddOpcUa();
|
|
Assert.That(
|
|
() => builder.AddMetrics((Action<IMetricsBuilder>)null!),
|
|
Throws.ArgumentNullException);
|
|
}
|
|
|
|
[Test]
|
|
public void IOpcUaBuilderIsBackwardsCompatibleWithIDependencyInjectionBuilder()
|
|
{
|
|
// Existing extension methods on IDependencyInjectionBuilder must
|
|
// still resolve through the new builder type.
|
|
var services = new ServiceCollection();
|
|
IDependencyInjectionBuilder legacy = services.AddOpcUa();
|
|
Assert.That(legacy.Services, Is.SameAs(services));
|
|
}
|
|
|
|
private static int CountDescriptorsFor<TService>(IServiceCollection services)
|
|
{
|
|
int count = 0;
|
|
foreach (ServiceDescriptor d in services)
|
|
{
|
|
if (d.ServiceType == typeof(TService))
|
|
{
|
|
count++;
|
|
}
|
|
}
|
|
return count;
|
|
}
|
|
|
|
private sealed class TelemetryContextStub : ITelemetryContext
|
|
{
|
|
public ILoggerFactory LoggerFactory => NullLoggerFactory.Instance;
|
|
|
|
public ActivitySource ActivitySource { get; } = new("Stub");
|
|
|
|
public Meter CreateMeter()
|
|
{
|
|
return new("Stub");
|
|
}
|
|
|
|
public Meter CreateMeter(System.Reflection.Assembly assembly)
|
|
{
|
|
return CreateMeter();
|
|
}
|
|
|
|
public ActivitySource GetActivitySource(System.Reflection.Assembly assembly)
|
|
{
|
|
return ActivitySource;
|
|
}
|
|
}
|
|
|
|
private sealed class BufferManagerFactoryStub : IBufferManagerFactory
|
|
{
|
|
public IBufferManager Create(
|
|
string name,
|
|
int maxBufferSize,
|
|
ITelemetryContext telemetry)
|
|
{
|
|
return new FastBufferManager(name, maxBufferSize, telemetry);
|
|
}
|
|
}
|
|
}
|
|
}
|