mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-17 05:11:13 +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>
408 lines
13 KiB
C#
408 lines
13 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.Diagnostics;
|
|
using System.Diagnostics.Metrics;
|
|
using System.Globalization;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using System.CommandLine;
|
|
using System.CommandLine.Help;
|
|
using Opc.Ua;
|
|
using Serilog;
|
|
using Serilog.Events;
|
|
#if NET5_0_OR_GREATER
|
|
using Microsoft.Extensions.Configuration;
|
|
#endif
|
|
|
|
namespace Quickstarts
|
|
{
|
|
/// <summary>
|
|
/// Simple console based telemetry
|
|
/// </summary>
|
|
public sealed class ConsoleTelemetry : ITelemetryContext, IDisposable
|
|
{
|
|
private readonly Action<ILoggingBuilder>? m_configure;
|
|
|
|
public ConsoleTelemetry(Action<ILoggingBuilder>? configure = null)
|
|
{
|
|
m_configure = configure;
|
|
|
|
LoggerFactory = Microsoft.Extensions.Logging.LoggerFactory
|
|
.Create(builder =>
|
|
{
|
|
builder.SetMinimumLevel(LogLevel.Information);
|
|
m_configure?.Invoke(builder);
|
|
});
|
|
try
|
|
{
|
|
LoggerFactory = LoggerFactory.AddSerilog(Log.Logger);
|
|
}
|
|
catch
|
|
{
|
|
LoggerFactory.Dispose();
|
|
throw;
|
|
}
|
|
|
|
ActivitySource = new ActivitySource("Quickstarts", "1.0.0");
|
|
|
|
m_logger = LoggerFactory.CreateLogger("Main");
|
|
|
|
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
|
|
TaskScheduler.UnobservedTaskException += Unobserved_TaskException;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ILoggerFactory LoggerFactory { get; internal set; }
|
|
|
|
/// <inheritdoc/>
|
|
public Meter CreateMeter()
|
|
{
|
|
return new Meter("Quickstarts", "1.0.0");
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public Meter CreateMeter(System.Reflection.Assembly assembly)
|
|
{
|
|
assembly.ThrowIfNull(nameof(assembly));
|
|
return CreateMeter();
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public ActivitySource ActivitySource { get; }
|
|
|
|
/// <inheritdoc/>
|
|
public ActivitySource GetActivitySource(System.Reflection.Assembly assembly)
|
|
{
|
|
assembly.ThrowIfNull(nameof(assembly));
|
|
return ActivitySource;
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
public void Dispose()
|
|
{
|
|
CreateMeter().Dispose();
|
|
ActivitySource.Dispose();
|
|
LoggerFactory.Dispose();
|
|
|
|
AppDomain.CurrentDomain.UnhandledException -= CurrentDomain_UnhandledException;
|
|
TaskScheduler.UnobservedTaskException -= Unobserved_TaskException;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Configure the logging providers.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Replaces the Opc.Ua.Core default ILogger with a
|
|
/// Microsoft.Extension.Logger with a Serilog file, debug and console logger.
|
|
/// The debug logger is only enabled for debug builds.
|
|
/// The console logger is enabled by the logConsole flag at the consoleLogLevel.
|
|
/// The file logger uses the setting in the ApplicationConfiguration.
|
|
/// The Trace logLevel is chosen if required by the Tracemasks.
|
|
/// </remarks>
|
|
/// <param name="configuration">The application configuration.</param>
|
|
/// <param name="context">The context name for the logger. </param>
|
|
/// <param name="logConsole">Enable logging to the console.</param>
|
|
/// <param name="logFile">Enable logging to a file.</param>
|
|
/// <param name="logApp">Enable application logging.</param>
|
|
/// <param name="consoleLogLevel">The LogLevel to use for the console/debug.<
|
|
/// /param>
|
|
public void ConfigureLogging(
|
|
ApplicationConfiguration configuration,
|
|
string context,
|
|
bool logConsole,
|
|
bool logFile,
|
|
bool logApp,
|
|
LogLevel consoleLogLevel)
|
|
{
|
|
if (!logApp)
|
|
{
|
|
return;
|
|
}
|
|
|
|
LoggerConfiguration loggerConfiguration = new LoggerConfiguration().Enrich
|
|
.FromLogContext();
|
|
|
|
if (logConsole)
|
|
{
|
|
loggerConfiguration.WriteTo.Console(
|
|
restrictedToMinimumLevel: (LogEventLevel)consoleLogLevel,
|
|
formatProvider: CultureInfo.InvariantCulture);
|
|
}
|
|
#if DEBUG
|
|
else
|
|
{
|
|
loggerConfiguration.WriteTo.Debug(
|
|
restrictedToMinimumLevel: (LogEventLevel)consoleLogLevel,
|
|
formatProvider: CultureInfo.InvariantCulture);
|
|
}
|
|
#endif
|
|
LogLevel fileLevel = LogLevel.Information;
|
|
|
|
// switch for Trace/Verbose output
|
|
int traceMasks = configuration.TraceConfiguration!.TraceMasks;
|
|
if ((traceMasks &
|
|
~(
|
|
Utils.TraceMasks.Information |
|
|
Utils.TraceMasks.Error |
|
|
Utils.TraceMasks.Security |
|
|
Utils.TraceMasks.StartStop |
|
|
Utils.TraceMasks.StackTrace
|
|
)) != 0)
|
|
{
|
|
fileLevel = LogLevel.Trace;
|
|
}
|
|
|
|
// add file logging if configured
|
|
if (logFile)
|
|
{
|
|
string? outputFilePath = configuration.TraceConfiguration!.OutputFilePath;
|
|
if (!string.IsNullOrWhiteSpace(outputFilePath))
|
|
{
|
|
#pragma warning disable CA1305 // Specify IFormatProvider
|
|
loggerConfiguration.WriteTo.File(
|
|
Utils.ReplaceSpecialFolderNames(outputFilePath)!,
|
|
restrictedToMinimumLevel: (LogEventLevel)fileLevel,
|
|
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] {Message:lj}{NewLine}{Exception}",
|
|
rollOnFileSizeLimit: true
|
|
);
|
|
#pragma warning restore CA1305 // Specify IFormatProvider
|
|
}
|
|
}
|
|
|
|
// adjust minimum level
|
|
if (fileLevel < LogLevel.Information || consoleLogLevel < LogLevel.Information)
|
|
{
|
|
loggerConfiguration.MinimumLevel.Verbose();
|
|
}
|
|
|
|
// create the serilog logger
|
|
Serilog.Core.Logger serilogger = loggerConfiguration.CreateLogger();
|
|
|
|
ILoggerFactory oldLoggerFactory = LoggerFactory;
|
|
LoggerFactory = Microsoft.Extensions.Logging.LoggerFactory
|
|
.Create(builder =>
|
|
{
|
|
builder.SetMinimumLevel(consoleLogLevel);
|
|
m_configure?.Invoke(builder);
|
|
});
|
|
try
|
|
{
|
|
LoggerFactory = LoggerFactory.AddSerilog(serilogger);
|
|
}
|
|
catch
|
|
{
|
|
LoggerFactory.Dispose();
|
|
throw;
|
|
}
|
|
m_logger = LoggerFactory.CreateLogger("Main");
|
|
|
|
oldLoggerFactory.Dispose();
|
|
}
|
|
|
|
private void CurrentDomain_UnhandledException(
|
|
object? sender,
|
|
UnhandledExceptionEventArgs args)
|
|
{
|
|
m_logger.UnhandledException(
|
|
args.ExceptionObject as Exception,
|
|
args.IsTerminating);
|
|
}
|
|
|
|
private void Unobserved_TaskException(
|
|
object? sender,
|
|
UnobservedTaskExceptionEventArgs args)
|
|
{
|
|
m_logger.UnobservedTaskException(
|
|
args.Exception,
|
|
args.Observed);
|
|
}
|
|
|
|
private Microsoft.Extensions.Logging.ILogger m_logger;
|
|
}
|
|
|
|
/// <summary>
|
|
/// The error code why the application exit.
|
|
/// </summary>
|
|
public enum ExitCode
|
|
{
|
|
Ok = 0,
|
|
ErrorNotStarted = 0x80,
|
|
ErrorRunning = 0x81,
|
|
ErrorException = 0x82,
|
|
ErrorStopping = 0x83,
|
|
ErrorCertificate = 0x84,
|
|
ErrorInvalidCommandLine = 0x100
|
|
}
|
|
|
|
/// <summary>
|
|
/// An exception that occured and caused an exit of the application.
|
|
/// </summary>
|
|
[Serializable]
|
|
public class ErrorExitException : Exception
|
|
{
|
|
public ExitCode ExitCode { get; }
|
|
|
|
public ErrorExitException(ExitCode exitCode)
|
|
{
|
|
ExitCode = exitCode;
|
|
}
|
|
|
|
public ErrorExitException()
|
|
{
|
|
ExitCode = ExitCode.Ok;
|
|
}
|
|
|
|
public ErrorExitException(string message)
|
|
: base(message)
|
|
{
|
|
ExitCode = ExitCode.Ok;
|
|
}
|
|
|
|
public ErrorExitException(string message, ExitCode exitCode)
|
|
: base(message)
|
|
{
|
|
ExitCode = exitCode;
|
|
}
|
|
|
|
public ErrorExitException(string message, Exception innerException)
|
|
: base(message, innerException)
|
|
{
|
|
ExitCode = ExitCode.Ok;
|
|
}
|
|
|
|
public ErrorExitException(string message, Exception innerException, ExitCode exitCode)
|
|
: base(message, innerException)
|
|
{
|
|
ExitCode = exitCode;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Helper functions shared in various console applications.
|
|
/// </summary>
|
|
public static class ConsoleUtils
|
|
{
|
|
/// <summary>
|
|
/// Merges environment variables into the argument list for System.CommandLine.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Converts environment settings to command line flags
|
|
/// because in some environments (e.g. docker cloud) it is
|
|
/// the only supported way to pass arguments.
|
|
/// </remarks>
|
|
public static string[] MergeEnvironmentArgs(
|
|
string[] args,
|
|
string environmentPrefix,
|
|
Command command)
|
|
{
|
|
#if NET5_0_OR_GREATER
|
|
IConfigurationRoot config = new ConfigurationBuilder()
|
|
.AddEnvironmentVariables(environmentPrefix + "_")
|
|
.Build();
|
|
|
|
List<string> argslist = [.. args];
|
|
foreach (Option option in command.Options)
|
|
{
|
|
if (option is HelpOption or VersionOption)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
string name = option.Name.TrimStart('-');
|
|
if (name.Length >= 3)
|
|
{
|
|
string? envKey = config[name.ToUpperInvariant()];
|
|
if (envKey != null)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(envKey))
|
|
{
|
|
argslist.Add("--" + name);
|
|
}
|
|
else
|
|
{
|
|
argslist.Add("--" + name);
|
|
argslist.Add(envKey);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return [.. argslist];
|
|
#else
|
|
return args;
|
|
#endif
|
|
}
|
|
|
|
/// <summary>
|
|
/// Create an event which is set if a user
|
|
/// enters the Ctrl-C key combination.
|
|
/// </summary>
|
|
public static ManualResetEvent CtrlCHandler(CancellationTokenSource cts)
|
|
{
|
|
var quitEvent = new ManualResetEvent(false);
|
|
try
|
|
{
|
|
Console.CancelKeyPress += (_, eArgs) =>
|
|
{
|
|
cts.Cancel();
|
|
quitEvent.Set();
|
|
eArgs.Cancel = true;
|
|
};
|
|
}
|
|
catch
|
|
{
|
|
// intentionally left blank
|
|
}
|
|
return quitEvent;
|
|
}
|
|
}
|
|
|
|
internal static partial class ConsoleTelemetryLog
|
|
{
|
|
[LoggerMessage(EventId = 9000, Level = LogLevel.Critical,
|
|
Message = "Unhandled Exception: (IsTerminating: {IsTerminating})")]
|
|
public static partial void UnhandledException(
|
|
this Microsoft.Extensions.Logging.ILogger logger,
|
|
Exception? exception,
|
|
bool isTerminating);
|
|
|
|
[LoggerMessage(EventId = 9001, Level = LogLevel.Critical,
|
|
Message = "Unobserved Task Exception (Observed: {Observed})")]
|
|
public static partial void UnobservedTaskException(
|
|
this Microsoft.Extensions.Logging.ILogger logger,
|
|
AggregateException exception,
|
|
bool observed);
|
|
}
|
|
|
|
}
|