Refactor: Structured logging.

Author: fdcastel

src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbBatchCommand.cs

@@ -19,12 +19,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Data.Common;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using FirebirdSql.Data.Common;
 using FirebirdSql.Data.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace FirebirdSql.Data.FirebirdClient;
 
@@ -33,7 +32,7 @@ public sealed class FbBatchCommand : IFbPreparedCommand, IDescriptorFiller, IDis
 		, IAsyncDisposable
 #endif
 {
-	static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbBatchCommand));
+	static readonly ILogger<FbBatchCommand> Log = FbLogManager.CreateLogger<FbBatchCommand>();
 
 	private const int DefaultBatchBufferSize = 16 * 1024 * 1024;
 

src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbCommand.cs

@@ -25,12 +25,13 @@
 using System.Threading.Tasks;
 using FirebirdSql.Data.Common;
 using FirebirdSql.Data.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace FirebirdSql.Data.FirebirdClient;
 
 public sealed class FbCommand : DbCommand, IFbPreparedCommand, IDescriptorFiller, ICloneable
 {
-	static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbCommand));
+	static readonly ILogger<FbCommand> Log = FbLogManager.CreateLogger<FbCommand>();
 
 	#region Fields
 

src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnection.cs

@@ -23,13 +23,14 @@
 using System.Threading.Tasks;
 using FirebirdSql.Data.Common;
 using FirebirdSql.Data.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace FirebirdSql.Data.FirebirdClient;
 
 [DefaultEvent("InfoMessage")]
 public sealed class FbConnection : DbConnection, ICloneable
 {
-	static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbConnection));
+	static readonly ILogger<FbConnection> Log = FbLogManager.CreateLogger<FbConnection>();
 
 	#region Static Pool Handling Methods
 

src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbTransaction.cs

@@ -22,12 +22,13 @@
 using System.Threading.Tasks;
 using FirebirdSql.Data.Common;
 using FirebirdSql.Data.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace FirebirdSql.Data.FirebirdClient;
 
 public sealed class FbTransaction : DbTransaction
 {
-	static readonly IFbLogger Log = FbLogManager.CreateLogger(nameof(FbTransaction));
+	static readonly ILogger<FbTransaction> Log = FbLogManager.CreateLogger<FbTransaction>();
 
 	internal const IsolationLevel DefaultIsolationLevel = IsolationLevel.ReadCommitted;
 

src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj

@@ -61,6 +61,7 @@
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
+	  <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Compile Update="FirebirdClient\FbBatchCommand.cs" />

src/FirebirdSql.Data.FirebirdClient/Logging/ConsoleLoggingProvider.cs

@@ -15,37 +15,26 @@
 
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
-using System;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Logging;
 
 namespace FirebirdSql.Data.Logging;
 
 public static class FbLogManager
 {
-	public static IFbLoggingProvider Provider
-	{
-		get
-		{
-			_providerRetrieved = true;
-			return _provider;
-		}
-		set
-		{
-			if (_providerRetrieved)
-				throw new InvalidOperationException("The logging provider must be set before any action is taken");
+	internal static ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
+	internal static bool IsParameterLoggingEnabled = false;
 
-			_provider = value ?? throw new ArgumentNullException(nameof(value));
-		}
+	public static void UseLoggerFactory(ILoggerFactory loggerFactory)
+	{
+		LoggerFactory = loggerFactory;
 	}
 
-	public static bool IsParameterLoggingEnabled { get; set; }
-
-	static IFbLoggingProvider _provider;
-	static bool _providerRetrieved;
-
-	static FbLogManager()
+	public static void EnableParameterLogging(bool enable = true)
 	{
-		_provider = new NullLoggingProvider();
+		IsParameterLoggingEnabled = enable;
 	}
 
-	internal static IFbLogger CreateLogger(string name) => Provider.CreateLogger("FirebirdClient." + name);
+	internal static ILogger<T> CreateLogger<T>() =>
+		LoggerFactory.CreateLogger<T>();
 }