SNOW-834781: Remove log4net and delegate logging to consumers

Snowflake.Data.Tests/IntegrationTests/ConnectionMultiplePoolsAsyncIT.cs

@@ -1,6 +1,7 @@
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Snowflake.Data.Client;
@@ -17,7 +18,7 @@ namespace Snowflake.Data.Tests.IntegrationTests
     public class ConnectionMultiplePoolsAsyncIT: SFBaseTestAsync
     {
         private readonly PoolConfig _previousPoolConfig = new PoolConfig();
-        private readonly SFLogger logger = SFLoggerFactory.GetLogger<SFConnectionIT>();
+        private readonly ILogger logger = SFLoggerFactory.GetCustomLogger<SFConnectionIT>();
 
         [SetUp]
         public new void BeforeTest()

Snowflake.Data.Tests/IntegrationTests/ConnectionPoolCommonIT.cs

@@ -11,6 +11,7 @@
 using Snowflake.Data.Core.Session;
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Util;
+using Microsoft.Extensions.Logging;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
@@ -20,7 +21,7 @@ namespace Snowflake.Data.Tests.IntegrationTests
     class ConnectionPoolCommonIT : SFBaseTest
     {
         private readonly ConnectionPoolType _connectionPoolTypeUnderTest;
-        private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<ConnectionPoolManager>();
+        private static readonly ILogger s_logger = SFLoggerFactory.GetCustomLogger<ConnectionPoolManager>();
         private readonly PoolConfig _previousPoolConfig;
 
         public ConnectionPoolCommonIT(ConnectionPoolType connectionPoolTypeUnderTest)
@@ -38,8 +39,8 @@ public ConnectionPoolCommonIT(ConnectionPoolType connectionPoolTypeUnderTest)
             {
                 SnowflakeDbConnectionPool.SetPooling(true);
             }
-            s_logger.Debug($"---------------- BeforeTest ---------------------");
-            s_logger.Debug($"Testing Pool Type: {SnowflakeDbConnectionPool.GetConnectionPoolVersion()}");
+            s_logger.LogDebug($"---------------- BeforeTest ---------------------");
+            s_logger.LogDebug($"Testing Pool Type: {SnowflakeDbConnectionPool.GetConnectionPoolVersion()}");
         }
 
         [TearDown]

Snowflake.Data.Tests/IntegrationTests/SFBindTestIT.cs

@@ -16,14 +16,15 @@
 using System.Globalization;
 using System.Collections.Generic;
 using Snowflake.Data.Tests.Util;
+using Microsoft.Extensions.Logging;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
 
     [TestFixture]
     class SFBindTestIT : SFBaseTest
     {
-        private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFBindTestIT>();
+        private static readonly ILogger s_logger = SFLoggerFactory.GetCustomLogger<SFBindTestIT>();
 
         [Test]
         public void TestArrayBind()
@@ -905,7 +906,7 @@ public void TestDateTimeBinding(ResultFormat resultFormat, SFTableType tableType
             var bindingThreshold = 65280; // when exceeded enforces bindings via file on stage
             var smallBatchRowCount = 2;
             var bigBatchRowCount = bindingThreshold / 2;
-            s_logger.Info(testCase);
+            s_logger.LogInformation(testCase);
 
             using (IDbConnection conn = new SnowflakeDbConnection(ConnectionString))
             {
@@ -944,7 +945,7 @@ public void TestDateTimeBinding(ResultFormat resultFormat, SFTableType tableType
                 var row = 0;
                 using (var select = conn.CreateCommand($"select {sql_columns} from {TableName} order by id"))
                 {
-                    s_logger.Debug(select.CommandText);
+                    s_logger.LogDebug(select.CommandText);
                     var reader = select.ExecuteReader();
                     while (reader.Read())
                     {
@@ -991,7 +992,7 @@ private void InsertSingleRecord(IDbConnection conn, string sqlInsert, DbType bin
                 }
 
                 // Act
-                s_logger.Info(sqlInsert);
+                s_logger.LogInformation(sqlInsert);
                 var rowsAffected = insert.ExecuteNonQuery();
 
                 // Assert
@@ -1030,7 +1031,7 @@ private void InsertMultipleRecords(IDbConnection conn, string sqlInsert, DbType
                 }
 
                 // Act
-                s_logger.Debug(sqlInsert);
+                s_logger.LogDebug(sqlInsert);
                 var rowsAffected = insert.ExecuteNonQuery();
 
                 // Assert

Snowflake.Data.Tests/IntegrationTests/SFConnectionIT.cs

@@ -17,14 +17,15 @@
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Mock;
 using Snowflake.Data.Tests.Util;
+using Microsoft.Extensions.Logging;
 
 namespace Snowflake.Data.Tests.IntegrationTests
 {
 
     [TestFixture]
     class SFConnectionIT : SFBaseTest
     {
-        private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFConnectionIT>();
+        private static readonly ILogger s_logger = SFLoggerFactory.GetCustomLogger<SFConnectionIT>();
 
         [Test]
         public void TestBasicConnection()
@@ -82,14 +83,14 @@
                     try
                     {
                         conn.Open();
-                        s_logger.Debug("{appName}");
+                        s_logger.LogDebug("{appName}");
                         Assert.Fail();
 
                     }
                     catch (SnowflakeDbException e)
                     {
                         // Expected
-                        s_logger.Debug("Failed opening connection ", e);
+                        s_logger.LogDebug("Failed opening connection ", e);
                         AssertIsConnectionFailure(e);
                     }
 
@@ -126,7 +127,7 @@
                 catch (SnowflakeDbException e)
                 {
                     // Expected
-                    s_logger.Debug("Failed opening connection ", e);
+                    s_logger.LogDebug("Failed opening connection ", e);
                     AssertIsConnectionFailure(e);
                 }
 
@@ -141,7 +142,7 @@
         {
             for (int i = 0; i < 2; ++i)
             {
-                s_logger.Debug($"Running try #{i}");
+                s_logger.LogDebug($"Running try #{i}");
                 SnowflakeDbConnection snowflakeConnection = null;
                 try
                 {
@@ -167,7 +168,7 @@
         {
             for (int i = 0; i < 2; ++i)
             {
-                s_logger.Debug($"Running try #{i}");
+                s_logger.LogDebug($"Running try #{i}");
                 SnowflakeDbConnection snowflakeConnection = null;
                 try
                 {
@@ -1558,7 +1559,7 @@
                 catch (SnowflakeDbException e)
                 {
                     // Expected
-                    s_logger.Debug("Failed opening connection ", e);
+                    s_logger.LogDebug("Failed opening connection ", e);
                     Assert.AreEqual(270001, e.ErrorCode); //Internal error
                     AssertIsConnectionFailure(e);
                 }
@@ -1867,7 +1868,7 @@
     [TestFixture]
     class SFConnectionITAsync : SFBaseTestAsync
     {
-        private static SFLogger logger = SFLoggerFactory.GetLogger<SFConnectionITAsync>();
+        private static ILogger logger = SFLoggerFactory.GetCustomLogger<SFConnectionITAsync>();
 
 
         [Test]
@@ -1897,7 +1898,7 @@
 
                 // Cancel the connection because it will never succeed since there is no
                 // connection_timeout defined
-                logger.Debug("connectionCancelToken.Cancel ");
+                logger.LogDebug("connectionCancelToken.Cancel ");
                 connectionCancelToken.Cancel();
 
                 try

Snowflake.Data.Tests/IntegrationTests/SFConnectionWithTomlIT.cs

@@ -6,6 +6,7 @@
 using System.Data;
 using System.IO;
 using System.Runtime.InteropServices;
+using Microsoft.Extensions.Logging;
 using Mono.Unix.Native;
 using NUnit.Framework;
 using Snowflake.Data.Client;
@@ -20,7 +21,7 @@ namespace Snowflake.Data.Tests.IntegrationTests
     [TestFixture, NonParallelizable]
     class SFConnectionWithTomlIT : SFBaseTest
     {
-        private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFConnectionIT>();
+        private static readonly ILogger s_logger = SFLoggerFactory.GetCustomLogger<SFConnectionIT>();
 
         private static string s_workingDirectory;
 

Snowflake.Data.Tests/Mock/MockSnowflakeDbConnection.cs

@@ -9,12 +9,13 @@
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace Snowflake.Data.Tests.Mock
 {
     class MockSnowflakeDbConnection : SnowflakeDbConnection
     {
-        private SFLogger logger = SFLoggerFactory.GetLogger<MockSnowflakeDbConnection>();
+        private ILogger logger = SFLoggerFactory.GetCustomLogger<MockSnowflakeDbConnection>();
 
         private IMockRestRequester _restRequester;
 
@@ -31,7 +32,7 @@
 
         public override void Open()
         {
-            logger.Debug("Open Connection.");
+            logger.LogDebug("Open Connection.");
             SetMockSession();
             try
             {
@@ -41,7 +42,7 @@
             {
                 // Otherwise when Dispose() is called, the close request would timeout.
                 _connectionState = System.Data.ConnectionState.Closed;
-                logger.Error("Unable to connect", e);
+                logger.LogError("Unable to connect", e);
                 throw;
             }
             OnSessionEstablished();
@@ -61,14 +62,14 @@
                     // Exception from SfSession.OpenAsync
                     Exception sfSessionEx = previousTask.Exception;
                         _connectionState = ConnectionState.Closed;
-                        logger.Error("Unable to connect", sfSessionEx);
+                        logger.LogError("Unable to connect", sfSessionEx);
                         throw //sfSessionEx.InnerException;
                         new SnowflakeDbException(sfSessionEx, SFError.INTERNAL_ERROR, "Unable to connect");
                     }
                     if (previousTask.IsCanceled)
                     {
                         _connectionState = ConnectionState.Closed;
-                        logger.Debug("Connection canceled");
+                        logger.LogDebug("Connection canceled");
                     }
                     else
                     {

Snowflake.Data.Tests/SFBaseTest.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2012-2021 Snowflake Computing Inc. All rights reserved.
  */
 
@@ -14,6 +14,7 @@
 using Snowflake.Data.Client;
 using Snowflake.Data.Log;
 using Snowflake.Data.Tests.Util;
+using Microsoft.Extensions.Logging;
 
 [assembly:LevelOfParallelism(10)]
 
@@ -57,7 +58,7 @@ public static void TearDownContext()
     #endif
     public class SFBaseTestAsync
     {
-        private static readonly SFLogger s_logger = SFLoggerFactory.GetLogger<SFBaseTestAsync>();
+        private static readonly ILogger s_logger = SFLoggerFactory.GetCustomLogger<SFBaseTestAsync>();
 
         private const string ConnectionStringWithoutAuthFmt = "scheme={0};host={1};port={2};" +
                                                               "account={3};role={4};db={5};schema={6};warehouse={7}";
@@ -118,7 +119,7 @@ protected void CreateOrReplaceTable(IDbConnection conn, string tableName, string
             var columnsStr = string.Join(", ", columns);
             var cmd = conn.CreateCommand();
             cmd.CommandText = $"CREATE OR REPLACE {tableType} TABLE {tableName}({columnsStr}) {additionalQueryStr}";
-            s_logger.Debug(cmd.CommandText);
+            s_logger.LogDebug(cmd.CommandText);
             cmd.ExecuteNonQuery();
 
             _tablesToRemove.Add(tableName);

Snowflake.Data.Tests/Snowflake.Data.Tests.csproj

@@ -13,10 +13,16 @@
   <ItemGroup>
     <PackageReference Include="JunitXml.TestLogger" Version="3.1.12" />
     <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.14" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Settings.Xml" Version="1.1.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="Tomlyn.Signed" Version="0.17.0" />
@@ -36,6 +42,21 @@
     <Reference Include="System.Net.Http.WebRequest" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="TestSerilog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="TestLog4Net.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="TestNLog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>full</DebugType>
     <DebugSymbols>True</DebugSymbols>

Snowflake.Data.Tests/TestLog4Net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+  <appender name="MyRollingFileAppender" type="log4net.Appender.RollingFileAppender">
+    <file value="${TEST_LOG4NET_FILE_NAME}"/>
+    <appendToFile value="true"/>
+    <rollingStyle value="Size" />
+    <maximumFileSize value="10MB" />
+    <staticLogFileName value="true" />
+    <maxSizeRollBackups value="10" />
+    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    <layout type="log4net.Layout.PatternLayout">
+    <conversionPattern value="[%date] [%t] [%-5level] [%logger] %message%newline" />
+    </layout>
+  </appender>
+
+  <root>
+    <level value="ALL" />
+    <appender-ref ref="MyRollingFileAppender" />
+  </root>
+</log4net>

Snowflake.Data.Tests/TestNLog.config

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- XSD manual extracted from package NLog.Schema: https://www.nuget.org/packages/NLog.Schema-->
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xsi:schemaLocation="NLog NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true"
+      internalLogLevel="Trace" >
+
+    <!-- the targets to write to -->
+    <targets>
+        <!-- write logs to file -->
+        <target xsi:type="File"
+                name="logfile"
+                fileName="${environment:TEST_NLOG_FILE_NAME}"
+                keepFileOpen="false"
+                concurrentWrites="true"
+                layout="${longdate}|${level}|${message} |${all-event-properties} ${exception:format=tostring}"/>
+    </targets>
+
+    <!-- rules to map from logger name to target -->
+    <rules>
+        <logger name="*" minlevel="Trace" writeTo="logfile" />
+    </rules>
+</nlog>

Snowflake.Data.Tests/TestSerilog.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<serilog>
+    <using>
+        <add name="Serilog.Sinks.File" />
+    </using>
+
+    <minimumLevel default="Verbose"></minimumLevel>
+
+    <writeTo>
+        <sink name="File">
+            <arg name="path" value="test_serilog.log" />
+            <arg name="shared" value="true" />
+        </sink>
+    </writeTo>
+</serilog>