Remove stack reflection from logging

roji · roji · commit 0a84b199a940 · 2019-07-22T23:03:23.000+02:00
Mainly to unblock CoreRT. Fixes #2542
diff --git a/src/Npgsql/BackendMessages/AuthenticationMessages.cs b/src/Npgsql/BackendMessages/AuthenticationMessages.cs
@@ -130,7 +130,7 @@ internal AuthenticationSASLContinueMessage(NpgsqlReadBuffer buf, int len)
 
     class AuthenticationSCRAMServerFirstMessage
     {
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(AuthenticationSCRAMServerFirstMessage));
 
         internal string Nonce { get; }
         internal string Salt { get; }
@@ -186,7 +186,7 @@ internal AuthenticationSASLFinalMessage(NpgsqlReadBuffer buf, int len)
 
     class AuthenticationSCRAMServerFinalMessage
     {
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(AuthenticationSCRAMServerFinalMessage));
 
         internal string ServerSignature { get; }
 
diff --git a/src/Npgsql/BackendMessages/ErrorOrNoticeMessage.cs b/src/Npgsql/BackendMessages/ErrorOrNoticeMessage.cs
@@ -25,13 +25,13 @@ class ErrorOrNoticeMessage
         internal string? Line { get; }
         internal string? Routine { get; }
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(ErrorOrNoticeMessage));
 
         // ReSharper disable once FunctionComplexityOverflow
         internal static ErrorOrNoticeMessage Load(NpgsqlReadBuffer buf)
         {
             (string? severity, string? invariantSeverity, string? code, string? message, string? detail, string? hint) = (null, null, null, null, null, null);
-            (int position, int internalPosition) = (0, 0);
+            var (position, internalPosition) = (0, 0);
             (string? internalQuery, string? where) = (null, null);
             (string? schemaName, string? tableName, string? columnName, string? dataTypeName, string? constraintName) =
                 (null, null, null, null, null);
diff --git a/src/Npgsql/ConnectorPool.cs b/src/Npgsql/ConnectorPool.cs
@@ -93,7 +93,7 @@ public override string ToString()
         /// </summary>
         internal const int PoolSizeLimit = 1024;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(ConnectorPool));
 
         #endregion
 
diff --git a/src/Npgsql/Counters.cs b/src/Npgsql/Counters.cs
@@ -47,7 +47,7 @@ static class Counters
         static bool _initialized;
         static readonly object InitLock = new object();
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(Counters));
 
 #pragma warning disable CA1801 // Review unused parameters
         internal static void Initialize(bool usePerfCounters)
diff --git a/src/Npgsql/KerberosUsernameProvider.cs b/src/Npgsql/KerberosUsernameProvider.cs
@@ -16,7 +16,7 @@ class KerberosUsernameProvider
         static string _principalWithRealm;
         static string _principalWithoutRealm;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(KerberosUsernameProvider));
 
         internal static string? GetUsername(bool includeRealm)
         {
diff --git a/src/Npgsql/Logging/NpgsqlLogManager.cs b/src/Npgsql/Logging/NpgsqlLogManager.cs
@@ -4,7 +4,7 @@
 namespace Npgsql.Logging
 {
     /// <summary>
-    /// Manages logging for Npgsql, used to set the loggging provider.
+    /// Manages logging for Npgsql, used to set the logging provider.
     /// </summary>
     public static class NpgsqlLogManager
     {
@@ -36,36 +36,7 @@ public static INpgsqlLoggingProvider Provider
         static INpgsqlLoggingProvider? _provider;
         static bool _providerRetrieved;
 
-        internal static NpgsqlLogger CreateLogger(string name) => Provider.CreateLogger(name);
-
-        internal static NpgsqlLogger GetCurrentClassLogger() => CreateLogger(GetClassFullName());
-
-        // Copied from NLog
-        static string GetClassFullName()
-        {
-            string className;
-            Type? declaringType;
-            var framesToSkip = 2;
-
-            do
-            {
-                var frame = new StackFrame(framesToSkip, false);
-                var method = frame.GetMethod();
-
-                declaringType = method.DeclaringType;
-                if (declaringType == null)
-                {
-                    className = method.Name;
-                    break;
-                }
-
-                framesToSkip++;
-                className = declaringType.FullName ?? declaringType.Name;
-            }
-            while (declaringType.Module.Name.Equals("mscorlib.dll", StringComparison.OrdinalIgnoreCase));
-
-            return className;
-        }
+        internal static NpgsqlLogger CreateLogger(string name) => Provider.CreateLogger("Npgsql." + name);
 
         static NpgsqlLogManager() => Provider = new NoOpLoggingProvider();
     }
diff --git a/src/Npgsql/NpgsqlBinaryExporter.cs b/src/Npgsql/NpgsqlBinaryExporter.cs
@@ -32,7 +32,7 @@ public sealed class NpgsqlBinaryExporter : ICancelable
         internal int NumColumns { get; }
 
         readonly NpgsqlTypeHandler?[] _typeHandlerCache;
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlBinaryExporter));
 
         #endregion
 
diff --git a/src/Npgsql/NpgsqlBinaryImporter.cs b/src/Npgsql/NpgsqlBinaryImporter.cs
@@ -37,7 +37,7 @@ public sealed class NpgsqlBinaryImporter : ICancelable
 
         readonly NpgsqlParameter?[] _params;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlBinaryImporter));
 
         #endregion
 
diff --git a/src/Npgsql/NpgsqlCommand.cs b/src/Npgsql/NpgsqlCommand.cs
@@ -59,7 +59,7 @@ public sealed class NpgsqlCommand : DbCommand, ICloneable
 
         static readonly SingleThreadSynchronizationContext SingleThreadSynchronizationContext = new SingleThreadSynchronizationContext("NpgsqlRemainingAsyncSendWorker");
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlCommand));
 
         #endregion Fields
 
diff --git a/src/Npgsql/NpgsqlConnection.cs b/src/Npgsql/NpgsqlConnection.cs
@@ -87,7 +87,7 @@ public sealed class NpgsqlConnection : DbConnection, ICloneable
         /// </summary>
         internal const int TimeoutLimit = 1024;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlConnection));
 
         static bool _countersInitialized;
 
@@ -334,10 +334,10 @@ public override string ConnectionString
         /// Gets or sets the delegate used to generate a password for new database connections.
         /// </summary>
         /// <remarks>
-        /// This delegate is executed when a new database connection is opened that requires a password. 
-        /// <see cref="NpgsqlConnectionStringBuilder.Password">Password</see> and 
-        /// <see cref="NpgsqlConnectionStringBuilder.Passfile">Passfile</see> connection string 
-        /// properties have precedence over this delegate. It will not be executed if a password is 
+        /// This delegate is executed when a new database connection is opened that requires a password.
+        /// <see cref="NpgsqlConnectionStringBuilder.Password">Password</see> and
+        /// <see cref="NpgsqlConnectionStringBuilder.Passfile">Passfile</see> connection string
+        /// properties have precedence over this delegate. It will not be executed if a password is
         /// specified, or the specified or default Passfile contains a valid entry.
         /// Due to connection pooling this delegate is only executed when a new physical connection
         /// is opened, not when reusing a connection that was previously opened from the pool.
diff --git a/src/Npgsql/NpgsqlConnector.cs b/src/Npgsql/NpgsqlConnector.cs
@@ -196,7 +196,7 @@ int ReceiveTimeout
 
         internal int ClearCounter { get; set; }
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlConnector));
 
         #endregion
 
diff --git a/src/Npgsql/NpgsqlDataReader.cs b/src/Npgsql/NpgsqlDataReader.cs
@@ -124,7 +124,7 @@ public sealed class NpgsqlDataReader : DbDataReader
         /// </summary>
         char[]? _tempCharBuf;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlDataReader));
 
         internal NpgsqlDataReader(NpgsqlConnector connector)
         {
diff --git a/src/Npgsql/NpgsqlFactory.cs b/src/Npgsql/NpgsqlFactory.cs
@@ -11,7 +11,7 @@ namespace Npgsql
     [Serializable]
     public sealed class NpgsqlFactory : DbProviderFactory, IServiceProvider
     {
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlFactory));
 
         /// <summary>
         /// Gets an instance of the <see cref="NpgsqlFactory"/>.
diff --git a/src/Npgsql/NpgsqlRawCopyStream.cs b/src/Npgsql/NpgsqlRawCopyStream.cs
@@ -44,7 +44,7 @@ public sealed class NpgsqlRawCopyStream : Stream, ICancelable
             (byte)'\n', 255, (byte)'\r', (byte)'\n', 0
         };
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlRawCopyStream));
 
         #endregion
 
diff --git a/src/Npgsql/NpgsqlTransaction.cs b/src/Npgsql/NpgsqlTransaction.cs
@@ -61,7 +61,7 @@ public override IsolationLevel IsolationLevel
         }
         IsolationLevel _isolationLevel;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(NpgsqlTransaction));
 
         const IsolationLevel DefaultIsolationLevel = IsolationLevel.ReadCommitted;
 
diff --git a/src/Npgsql/PostgresDatabaseInfo.cs b/src/Npgsql/PostgresDatabaseInfo.cs
@@ -35,7 +35,7 @@ class PostgresDatabaseInfo : NpgsqlDatabaseInfo
         /// <summary>
         /// The Npgsql logger instance.
         /// </summary>
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(PostgresDatabaseInfo));
 
         /// <summary>
         /// The PostgreSQL types detected in the database.
diff --git a/src/Npgsql/PreparedStatementManager.cs b/src/Npgsql/PreparedStatementManager.cs
@@ -26,7 +26,7 @@ class PreparedStatementManager
         internal string NextPreparedStatementName() => "_p" + (++_preparedStatementIndex);
         ulong _preparedStatementIndex;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(PreparedStatementManager));
 
         internal const int CandidateCount = 100;
 
diff --git a/src/Npgsql/TypeMapping/ConnectorTypeMapper.cs b/src/Npgsql/TypeMapping/ConnectorTypeMapper.cs
@@ -52,7 +52,7 @@ internal NpgsqlDatabaseInfo DatabaseInfo
         /// </summary>
         internal int ChangeCounter { get; private set; }
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(ConnectorTypeMapper));
 
         #region Construction
 
diff --git a/src/Npgsql/VolatileResourceManager.cs b/src/Npgsql/VolatileResourceManager.cs
@@ -23,7 +23,7 @@ class VolatileResourceManager : ISinglePhaseNotification
         bool IsPrepared => _preparedTxName != null;
         bool _isDisposed;
 
-        static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();
+        static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(VolatileResourceManager));
 
         const int MaximumRollbackAttempts = 20;
 

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ internal AuthenticationSASLContinueMessage(NpgsqlReadBuffer buf, int len)`
`130`	`130`
`131`	`131`	`class AuthenticationSCRAMServerFirstMessage`
`132`	`132`	`{`
`133`		`- static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();`
	`133`	`+ static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(AuthenticationSCRAMServerFirstMessage));`
`134`	`134`
`135`	`135`	`internal string Nonce { get; }`
`136`	`136`	`internal string Salt { get; }`
`@@ -186,7 +186,7 @@ internal AuthenticationSASLFinalMessage(NpgsqlReadBuffer buf, int len)`
`186`	`186`
`187`	`187`	`class AuthenticationSCRAMServerFinalMessage`
`188`	`188`	`{`
`189`		`- static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();`
	`189`	`+ static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(AuthenticationSCRAMServerFinalMessage));`
`190`	`190`
`191`	`191`	`internal string ServerSignature { get; }`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class KerberosUsernameProvider`
`16`	`16`	`static string _principalWithRealm;`
`17`	`17`	`static string _principalWithoutRealm;`
`18`	`18`
`19`		`- static readonly NpgsqlLogger Log = NpgsqlLogManager.GetCurrentClassLogger();`
	`19`	`+ static readonly NpgsqlLogger Log = NpgsqlLogManager.CreateLogger(nameof(KerberosUsernameProvider));`
`20`	`20`
`21`	`21`	`internal static string? GetUsername(bool includeRealm)`
`22`	`22`	`{`