Renamed ILogger to INeo4jLogger in preparation for integration with standard logging framework (#881)

* Renamed ILogger to INeo4jLogger in preparation for integration with standard logging framework

* Fix infinite loop in LoadBalancer

* Timeout cancels long running task

Author: RichardIrons-neo4j

Neo4j.Driver/Neo4j.Driver.Reactive/DriverExtensions.cs

@@ -48,6 +48,6 @@ public static IRxSession RxSession(this IDriver driver, Action<SessionConfigBuil
 
         return new InternalRxSession(
             reactiveDriver.Session(action, true),
-            new RxRetryLogic(reactiveDriver.Config.MaxTransactionRetryTime, reactiveDriver.Config.Logger));
+            new RxRetryLogic(reactiveDriver.Config.MaxTransactionRetryTime, reactiveDriver.Config.Neo4JLogger));
     }
 }

Neo4j.Driver/Neo4j.Driver.Reactive/Internal/RxRetryLogic.cs

@@ -30,18 +30,18 @@ internal class RxRetryLogic : IRxRetryLogic
     private readonly double _delayJitter;
     private readonly double _delayMultiplier;
     private readonly double _initialDelay;
-    private readonly ILogger _logger;
+    private readonly INeo4jLogger _neo4JLogger;
     private readonly int _maxRetryTimeout;
     private readonly Random _random;
 
-    public RxRetryLogic(TimeSpan maxRetryTimeout, ILogger logger)
+    public RxRetryLogic(TimeSpan maxRetryTimeout, INeo4jLogger neo4JLogger)
     {
         _maxRetryTimeout = (int)maxRetryTimeout.TotalMilliseconds;
         _initialDelay = TimeSpan.FromSeconds(1).TotalMilliseconds;
         _delayMultiplier = 2.0;
         _delayJitter = 0.2;
         _random = new Random(Guid.NewGuid().GetHashCode());
-        _logger = logger;
+        _neo4JLogger = neo4JLogger;
     }
 
     public IObservable<T> Retry<T>(IObservable<T> work)
@@ -76,7 +76,7 @@ public IObservable<T> Retry<T>(IObservable<T> work)
                         var delayDuration = TimeSpan.FromMilliseconds(ComputeNextDelay(delay));
                         delay *= _delayMultiplier;
                         retryCount++;
-                        _logger?.Warn(exc, $"Transaction failed and will be retried in {delay} ms.");
+                        _neo4JLogger?.Warn(exc, $"Transaction failed and will be retried in {delay} ms.");
                         return Observable.Return(1).Delay(delayDuration);
                     });
             });

Neo4j.Driver/Neo4j.Driver.Simple/DriverExtensions.cs

@@ -48,7 +48,7 @@ public static ISession Session(this IDriver driver, Action<SessionConfigBuilder>
 
         return new InternalSession(
             driver.AsyncSession(action).CastOrThrow<IInternalAsyncSession>(),
-            new RetryLogic(asyncDriver.Config.MaxTransactionRetryTime, asyncDriver.Config.Logger),
+            new RetryLogic(asyncDriver.Config.MaxTransactionRetryTime, asyncDriver.Config.Neo4JLogger),
             new BlockingExecutor());
     }
 }

Neo4j.Driver/Neo4j.Driver.Simple/Internal/RetryLogic.cs

@@ -30,18 +30,18 @@ internal class RetryLogic : IRetryLogic
     private readonly double _delayJitter;
     private readonly double _delayMultiplier;
     private readonly double _initialDelay;
-    private readonly ILogger _logger;
+    private readonly INeo4jLogger _neo4JLogger;
     private readonly int _maxRetryTimeout;
     private readonly Random _random;
 
-    public RetryLogic(TimeSpan maxRetryTimeout, ILogger logger)
+    public RetryLogic(TimeSpan maxRetryTimeout, INeo4jLogger neo4JLogger)
     {
         _maxRetryTimeout = (int)maxRetryTimeout.TotalMilliseconds;
         _initialDelay = TimeSpan.FromSeconds(1).TotalMilliseconds;
         _delayMultiplier = 2.0;
         _delayJitter = 0.2;
         _random = new Random(Guid.NewGuid().GetHashCode());
-        _logger = logger;
+        _neo4JLogger = neo4JLogger;
     }
 
     public T Retry<T>(Func<T> work)
@@ -69,7 +69,7 @@ public T Retry<T>(Func<T> work)
                 if (shouldRetry)
                 {
                     var delay = TimeSpan.FromMilliseconds(ComputeNextDelay(delayMs));
-                    _logger?.Warn(e, $"Transaction failed and will be retried in {delay}ms.");
+                    _neo4JLogger?.Warn(e, $"Transaction failed and will be retried in {delay}ms.");
                     Thread.Sleep(delay);
                     delayMs *= _delayMultiplier;
                 }

Neo4j.Driver/Neo4j.Driver.Tests.Integration/ExamplesAsync.cs

@@ -620,7 +620,7 @@ public DriverIntroductionExample(string uri, string user, string password)
                 _driver = GraphDatabase.Driver(
                     uri,
                     AuthTokens.Basic(user, password),
-                    configBuilder => configBuilder.WithLogger(new SimpleLogger()));
+                    configBuilder => configBuilder.WithLogger(new SimpleNeo4JLogger()));
             }
 
             public void Dispose()
@@ -732,7 +732,7 @@ public static async Task Main(string[] args)
             }
         }
 
-        internal class SimpleLogger : ILogger
+        internal class SimpleNeo4JLogger : INeo4jLogger
         {
             public void Debug(string message, params object[] args)
             {

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Internals/StandAlone/DefaultInstallation.cs

@@ -58,8 +58,8 @@ public static IDriver NewBoltDriver(Uri boltUri, IAuthToken authToken)
     {
         var configuredLevelStr = Environment.GetEnvironmentVariable("NEOLOGLEVEL");
         var logger = Enum.TryParse<ExtendedLogLevel>(configuredLevelStr ?? "", true, out var configuredLevel)
-            ? new TestLogger(Console.WriteLine, configuredLevel)
-            : new TestLogger(s => Debug.WriteLine(s), ExtendedLogLevel.Debug);
+            ? new TestNeo4JLogger(Console.WriteLine, configuredLevel)
+            : new TestNeo4JLogger(s => Debug.WriteLine(s), ExtendedLogLevel.Debug);
 
         return GraphDatabase.Driver(boltUri, authToken, o => { o.WithLogger(logger); });
     }

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Routing/BoltV4IT.cs

@@ -35,7 +35,7 @@ public BoltV4IT(ITestOutputHelper output, CausalClusterIntegrationTestFixture fi
         _driver = GraphDatabase.Driver(
             Cluster.BoltRoutingUri,
             Cluster.AuthToken,
-            o => o.WithLogger(TestLogger.Create(output)));
+            o => o.WithLogger(TestNeo4JLogger.Create(output)));
     }
 
     [RequireClusterFact("4.0.0", GreaterThanOrEqualTo)]

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Routing/RoutingDriverTestBase.cs

@@ -34,7 +34,7 @@ protected RoutingDriverTestBase(ITestOutputHelper output, CausalClusterIntegrati
             AuthToken,
             builder =>
             {
-                builder.WithLogger(TestLogger.Create(output));
+                builder.WithLogger(TestNeo4JLogger.Create(output));
                 Cluster.Configure(builder);
             });
     }

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Stress/StressTest.cs

@@ -84,7 +84,7 @@ protected StressTest(
             builder =>
             {
                 builder
-                    .WithLogger(new StressTestLogger(_output, minLevel))
+                    .WithLogger(new StressTestNeo4JLogger(_output, minLevel))
                     .WithMaxConnectionPoolSize(100)
                     .WithConnectionAcquisitionTimeout(TimeSpan.FromMinutes(1));
 
@@ -109,12 +109,12 @@ private enum StressTestMinLogLevel
         None
     }
 
-    private class StressTestLogger : ILogger
+    private class StressTestNeo4JLogger : INeo4jLogger
     {
         private readonly StressTestMinLogLevel _minLevel;
         private readonly ITestOutputHelper _output;
 
-        public StressTestLogger(ITestOutputHelper output, StressTestMinLogLevel minLevel)
+        public StressTestNeo4JLogger(ITestOutputHelper output, StressTestMinLogLevel minLevel)
         {
             _output = output ?? throw new ArgumentNullException(nameof(output));
             _minLevel = minLevel;

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Stub/DirectDriverTests.cs

@@ -31,7 +31,7 @@ public DirectDriverTests(ITestOutputHelper output)
     {
         SetupConfig = o => o
             .WithEncryptionLevel(EncryptionLevel.None)
-            .WithLogger(TestLogger.Create(output));
+            .WithLogger(TestNeo4JLogger.Create(output));
     }
 
     private Action<ConfigBuilder> SetupConfig { get; }
@@ -44,7 +44,7 @@ public async Task ShouldLogServerAddress()
         void SetupConfig(ConfigBuilder o)
         {
             o.WithEncryptionLevel(EncryptionLevel.None);
-            o.WithLogger(new TestLogger(logs.Add, ExtendedLogLevel.Debug));
+            o.WithLogger(new TestNeo4JLogger(logs.Add, ExtendedLogLevel.Debug));
         }
 
         using var _ = BoltStubServer.Start("V4/accessmode_reader_implicit", 9001);