mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-18 06:31:35 +08:00
9b034f8291
# Description Nullable reference types are now enabled once, in `common.props`, and every project in the repository builds warning-clean with them. **Configuration** - `<Nullable>enable</Nullable>` lives in `common.props`. All per-project `<Nullable>` settings are removed: 178 project files (enable, annotations, and the `disable` in the three Aot test projects). - 419 per-file `#nullable enable`/`restore` directives and the 4 `#nullable disable` directives are removed. - Kept on purpose: - The 5 `<auto-generated>` schema files (`UANodeSet.cs`, `UA Type Dictionary.cs`, `OPCBinarySchema.cs`, `SecuredApplication.cs`, `PInvokeHelper.cs`) keep `#nullable enable`. The compiler ignores the project setting in generated code, so the directive is required there. - `tests/Opc.Ua.Interop.LegacyPeer` keeps `disable`. It builds against the 1.5.378 packages and does not import the repository props. - `docs/DeveloperGuide.md` and `.github/copilot-instructions.md` now describe the central setting. **Migration** (the 43 unset and 13 annotations-only projects, roughly 10k diagnostics) - **Production code: annotated at the declarations.** Covers `tools/Opc.Ua.SourceGeneration.Core`, `src/Opc.Ua.Lds.Server` and the LDS sample. - Members, parameters and returns are nullable where null actually flows. - Null-check helpers carry `[NotNullWhen]` (`IsNull`, `IsValidXmlName`, `IsMethodTypeDesign`). - `CoreUtils.Format`, `Utils.Format`, `ITemplateWriter.WriteLine` take `params object?[]`. `Template.AddReplacement` takes `string?` (rendering already skips null replacements). - `IRegisteredServerStore.RegisterAsync` returns `Task<RegistrationEntry?>`: it returns null when a registration is removed. - Dereferences backed by an invariant (for example, the validated model) use `!`, so runtime behaviour is unchanged. - **Behavioural changes in production code** (small, deliberate): - `NodeSetToModelDesign` throws `InvalidOperationException` when the file is not a NodeSet. Before, it threw a NullReferenceException on the next line. - `ModelDesignValidator` starts its lookup tables empty instead of null. A redundant `if (m_nodes == null) return;` guard is gone. - **Test code: minimal annotations.** - `?` on values that can be null, `!` where the test asserts non-null. - `= null!` for fixture members assigned in SetUp. - `TryGetStructure<T>(out T? x)` where the inferred `T?` broke the `IEncodeable` constraint. - A few redundant `== null` checks on structs (`NodeId`, `ArrayOf<T>`) folded into the adjacent `IsNull`/`Count` checks. **Notes for reviewers** - The diff is large (~1,500 files) but almost entirely mechanical: `?`, `!` and directive removal. The non-annotation changes are listed above. - Known follow-up, not done here: `IModelDesign.Namespaces/TargetNamespace/NamespaceUris` stay non-nullable even though the validator returns null before it loads a dictionary. Making them nullable would ripple through every generator call site. ## Related Issues - Fixes #4439 ## 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. - [ ] 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. The "no new warnings" box covers net10.0 and net48: full non-incremental builds of `UA.slnx`, `tools/SourceGeneration.slnx`, `tools/MigrationAnalyzer.slnx` and the Aot test projects finished with 0 warnings and 0 errors under the repository's warnings-as-errors settings. net9.0 and net8.0 also had no nullable diagnostics, but they were not rebuilt after the final fixes. Tests have not been run locally yet. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
205 lines
7.4 KiB
C#
205 lines
7.4 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 System.Globalization;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Serilog;
|
|
using Serilog.Events;
|
|
using Serilog.Templates;
|
|
|
|
namespace Opc.Ua.Fuzzing
|
|
{
|
|
/// <summary>
|
|
/// Simple console based telemetry
|
|
/// </summary>
|
|
public sealed class Logging : ITelemetryContext, IDisposable
|
|
{
|
|
public Logging(Action<ILoggingBuilder>? configure = null)
|
|
{
|
|
LoggerFactory = Microsoft.Extensions.Logging.LoggerFactory
|
|
.Create(builder =>
|
|
{
|
|
builder.SetMinimumLevel(LogLevel.Information);
|
|
configure?.Invoke(builder);
|
|
});
|
|
try
|
|
{
|
|
LoggerFactory = LoggerFactory.AddSerilog(Log.Logger);
|
|
}
|
|
catch
|
|
{
|
|
LoggerFactory.Dispose();
|
|
throw;
|
|
}
|
|
|
|
ActivitySource = new ActivitySource("Fuzzing", "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("Fuzzing", "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="context">The context name for the logger. </param>
|
|
/// <param name="outputFilePath">The output file.</param>
|
|
/// <param name="logConsole">Enable logging to the console.</param>
|
|
/// <param name="consoleLogLevel">The LogLevel to use for the console/debug.<
|
|
/// /param>
|
|
public void Configure(
|
|
string context,
|
|
string outputFilePath,
|
|
bool logConsole,
|
|
LogLevel consoleLogLevel)
|
|
{
|
|
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
|
|
const LogLevel fileLevel = LogLevel.Information;
|
|
|
|
// add file logging if configured
|
|
if (!string.IsNullOrWhiteSpace(outputFilePath))
|
|
{
|
|
loggerConfiguration.WriteTo.File(
|
|
new ExpressionTemplate(
|
|
"{UtcDateTime(@t):yyyy-MM-dd HH:mm:ss.fff} [{@l:u3}] {@m}\n{@x}"),
|
|
Utils.ReplaceSpecialFolderNames(outputFilePath)!,
|
|
restrictedToMinimumLevel: (LogEventLevel)fileLevel,
|
|
rollOnFileSizeLimit: true
|
|
);
|
|
}
|
|
|
|
// adjust minimum level
|
|
if (fileLevel < LogLevel.Information || consoleLogLevel < LogLevel.Information)
|
|
{
|
|
loggerConfiguration.MinimumLevel.Verbose();
|
|
}
|
|
|
|
// create the serilog logger
|
|
Serilog.Core.Logger serilogger = loggerConfiguration.CreateLogger();
|
|
|
|
// create the ILogger for Opc.Ua.Core
|
|
LoggerFactory = LoggerFactory.AddSerilog(serilogger);
|
|
m_logger = LoggerFactory.CreateLogger("Main");
|
|
}
|
|
|
|
private void CurrentDomain_UnhandledException(
|
|
object sender,
|
|
UnhandledExceptionEventArgs args)
|
|
{
|
|
if (m_logger.IsEnabled(LogLevel.Critical))
|
|
{
|
|
m_logger.LogCritical(
|
|
"Unhandled Exception: {ExceptionObject} IsTerminating: {IsTerminating}",
|
|
args.ExceptionObject,
|
|
args.IsTerminating);
|
|
}
|
|
}
|
|
|
|
private void Unobserved_TaskException(
|
|
object? sender,
|
|
UnobservedTaskExceptionEventArgs args)
|
|
{
|
|
if (m_logger.IsEnabled(LogLevel.Critical))
|
|
{
|
|
m_logger.LogCritical(args.Exception,
|
|
"Unobserved Exception: Observed: {Observed}",
|
|
args.Observed);
|
|
}
|
|
}
|
|
|
|
private Microsoft.Extensions.Logging.ILogger m_logger;
|
|
}
|
|
}
|