mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-28 22:55:49 +08:00
# Description Replace the four stack-owned `System.Diagnostics.Tracing.EventSource` providers with source-generated `ILogger` logging. - Preserve the legacy provider category names, numeric event IDs, event names, levels, message structure, and semantic structured fields. - Remove `ClientTraceFlags.EventLog` and route `ClientTraceFlags.Log` through the canonical `OPC-UA-Core` compatibility events. - Keep ChannelManager activities and metrics while moving its diagnostic events to the `Opc.Ua.ChannelManager` logger category. - Replace EventListener-based unit and stress-test collection with structured logger providers. - Document the ETW removal, retained compatibility identities, and migration path for existing consumers. ## Validation - `dotnet build UA.slnx -c Release -p:CustomTestTarget=net10.0 -p:NuGetAudit=false` - Focused Core, Client, and Server logging tests on `net10.0` and `net48` - Stress harness Release build and `SessionRecoversFromAcceptButStallAsync` - Direct AOT test application: 115 tests passed - `dotnet test UA.slnx -c Release -p:CustomTestTarget=net48 -p:NuGetAudit=false` The full `net10.0` `dotnet test UA.slnx` invocation is currently blocked by the repository's existing mixed VSTest/Microsoft.Testing.Platform configuration in `Opc.Ua.Aot.Tests`; the AOT project builds and its test executable passes directly. ## Related Issues - Related to #1262 ## 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. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: b0d90b8a-cde9-4fca-9a75-84f4cecb227d
199 lines
6.3 KiB
C#
199 lines
6.3 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 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/
|
|
* ======================================================================*/
|
|
|
|
#nullable enable
|
|
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Collections.Generic;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace Opc.Ua.Tests
|
|
{
|
|
/// <summary>
|
|
/// Thread-safe logger provider for asserting structured log contracts.
|
|
/// </summary>
|
|
public sealed class RecordingLoggerProvider : ILoggerProvider
|
|
{
|
|
/// <summary>
|
|
/// Initializes a recording provider.
|
|
/// </summary>
|
|
/// <param name="minimumLevel">The minimum level to capture.</param>
|
|
public RecordingLoggerProvider(LogLevel minimumLevel = LogLevel.Trace)
|
|
{
|
|
MinimumLevel = minimumLevel;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets or sets the minimum captured log level.
|
|
/// </summary>
|
|
public LogLevel MinimumLevel { get; set; }
|
|
|
|
/// <summary>
|
|
/// Gets a snapshot of the captured records.
|
|
/// </summary>
|
|
public IReadOnlyList<RecordedLogRecord> Records => m_records.ToArray();
|
|
|
|
/// <inheritdoc/>
|
|
public ILogger CreateLogger(string categoryName)
|
|
{
|
|
return new RecordingLogger(this, categoryName);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
}
|
|
|
|
private sealed class RecordingLogger : ILogger
|
|
{
|
|
public RecordingLogger(RecordingLoggerProvider provider, string categoryName)
|
|
{
|
|
m_provider = provider;
|
|
m_categoryName = categoryName;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public IDisposable BeginScope<TState>(TState state)
|
|
where TState : notnull
|
|
{
|
|
return EmptyScope.Instance;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public bool IsEnabled(LogLevel logLevel)
|
|
{
|
|
return logLevel >= m_provider.MinimumLevel &&
|
|
logLevel != LogLevel.None;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Log<TState>(
|
|
LogLevel logLevel,
|
|
EventId eventId,
|
|
TState state,
|
|
Exception? exception,
|
|
Func<TState, Exception?, string> formatter)
|
|
{
|
|
if (!IsEnabled(logLevel))
|
|
{
|
|
return;
|
|
}
|
|
|
|
var properties = new Dictionary<string, object?>(StringComparer.Ordinal);
|
|
if (state is IEnumerable<KeyValuePair<string, object?>> values)
|
|
{
|
|
foreach (KeyValuePair<string, object?> value in values)
|
|
{
|
|
properties[value.Key] = value.Value;
|
|
}
|
|
}
|
|
|
|
m_provider.m_records.Enqueue(
|
|
new RecordedLogRecord(
|
|
m_categoryName,
|
|
logLevel,
|
|
eventId,
|
|
formatter(state, exception),
|
|
properties,
|
|
exception));
|
|
}
|
|
|
|
private readonly RecordingLoggerProvider m_provider;
|
|
private readonly string m_categoryName;
|
|
}
|
|
|
|
private sealed class EmptyScope : IDisposable
|
|
{
|
|
public static EmptyScope Instance { get; } = new();
|
|
|
|
public void Dispose()
|
|
{
|
|
}
|
|
}
|
|
|
|
private readonly ConcurrentQueue<RecordedLogRecord> m_records = new();
|
|
}
|
|
|
|
/// <summary>
|
|
/// A structured log record captured by <see cref="RecordingLoggerProvider"/>.
|
|
/// </summary>
|
|
public sealed class RecordedLogRecord
|
|
{
|
|
/// <summary>
|
|
/// Initializes a captured log record.
|
|
/// </summary>
|
|
public RecordedLogRecord(
|
|
string categoryName,
|
|
LogLevel logLevel,
|
|
EventId eventId,
|
|
string message,
|
|
IReadOnlyDictionary<string, object?> properties,
|
|
Exception? exception)
|
|
{
|
|
CategoryName = categoryName;
|
|
LogLevel = logLevel;
|
|
EventId = eventId;
|
|
Message = message;
|
|
Properties = properties;
|
|
Exception = exception;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the logger category.
|
|
/// </summary>
|
|
public string CategoryName { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the log level.
|
|
/// </summary>
|
|
public LogLevel LogLevel { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the event identity.
|
|
/// </summary>
|
|
public EventId EventId { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the formatted message.
|
|
/// </summary>
|
|
public string Message { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the structured log properties.
|
|
/// </summary>
|
|
public IReadOnlyDictionary<string, object?> Properties { get; }
|
|
|
|
/// <summary>
|
|
/// Gets the associated exception.
|
|
/// </summary>
|
|
public Exception? Exception { get; }
|
|
}
|
|
}
|