Fixed logging so it works correctly! (#341)

* Fixed logging so it works correctly!

* timing

* bump

* tests are still stalling on windows

* buffer work done test

* Update client tests to skip windows too

* minor fix

Author: david-driscoll

.build/Build.cs

@@ -57,6 +57,7 @@ public partial class Solution : NukeBuild,
 
     public Target Clean => _ => _.Inherit<ICanClean>(x => x.Clean);
     public Target Restore => _ => _.Inherit<ICanRestoreWithDotNetCore>(x => x.CoreRestore);
+
     public Target Test => _ => _.Inherit<ICanTestWithDotNetCore>(x => x.CoreTest);
 
     public Target BuildVersion => _ => _.Inherit<IHaveBuildVersion>(x => x.BuildVersion)

src/Dap.Testing/DebugAdapterProtocolTestBase.cs

@@ -47,7 +47,6 @@ Action<DebugAdapterServerOptions> serverOptionsAction
                        .ConfigureLogging(
                             x => {
                                 x.SetMinimumLevel(LogLevel.Trace);
-                                x.Services.AddSingleton(TestOptions.ClientLoggerFactory);
                             }
                         )
                        .Services
@@ -65,7 +64,6 @@ Action<DebugAdapterServerOptions> serverOptionsAction
                        .ConfigureLogging(
                             x => {
                                 x.SetMinimumLevel(LogLevel.Trace);
-                                x.Services.AddSingleton(TestOptions.ServerLoggerFactory);
                             }
                         )
                        .Services

src/Dap.Testing/DebugAdapterServerTestBase.cs

@@ -31,10 +31,10 @@ protected virtual async Task<IDebugAdapterClient> InitializeClient(Action<DebugA
                     options
                        .WithInput(reader)
                        .WithOutput(writer)
+                       .WithLoggerFactory(TestOptions.ClientLoggerFactory)
                        .ConfigureLogging(
                             x => {
                                 x.SetMinimumLevel(LogLevel.Trace);
-                                x.Services.AddSingleton(TestOptions.ClientLoggerFactory);
                             }
                         )
                        .Services

src/JsonRpc.Testing/JsonRpcServerTestBase.cs

@@ -36,14 +36,14 @@ Action<JsonRpcServerOptions> serverOptionsAction
             var clientTask = JsonRpcServer.From(
                 options => {
                     options
+                       .WithLoggerFactory(TestOptions.ClientLoggerFactory)
                        .WithServices(
                             services => services
                                        .AddTransient(typeof(IPipelineBehavior<,>), typeof(SettlePipeline<,>))
                                        .AddSingleton(ClientEvents as IRequestSettler)
                                        .AddLogging(
                                             x => {
                                                 x.SetMinimumLevel(LogLevel.Trace);
-                                                x.Services.AddSingleton(TestOptions.ClientLoggerFactory);
                                             }
                                         )
                         );

src/JsonRpc/JsonRpcServerOptionsBase.cs

@@ -8,6 +8,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Nerdbank.Streams;
 
 namespace OmniSharp.Extensions.JsonRpc
@@ -86,6 +87,7 @@ public T WithPipe(Pipe pipe)
 
         public T WithLoggerFactory(ILoggerFactory loggerFactory)
         {
+            if (loggerFactory == NullLoggerFactory.Instance) return (T) (object) this;
             Services.RemoveAll(typeof(ILoggerFactory));
             Services.AddSingleton(loggerFactory);
             return (T) (object) this;

src/JsonRpc/ResponseRouter.cs

@@ -9,31 +9,31 @@
 
 namespace OmniSharp.Extensions.JsonRpc
 {
-    public class ResponseRouter : IResponseRouter
+    internal class ResponseRouter : IResponseRouter
     {
-        internal readonly IOutputHandler OutputHandler;
+        internal readonly Lazy<IOutputHandler> OutputHandler;
         internal readonly ISerializer Serializer;
         private readonly IHandlerTypeDescriptorProvider<IHandlerTypeDescriptor> _handlerTypeDescriptorProvider;
 
         internal readonly ConcurrentDictionary<long, (string method, TaskCompletionSource<JToken> pendingTask)> Requests =
             new ConcurrentDictionary<long, (string method, TaskCompletionSource<JToken> pendingTask)>();
 
-        public ResponseRouter(IOutputHandler outputHandler, ISerializer serializer, IHandlerTypeDescriptorProvider<IHandlerTypeDescriptor> handlerTypeDescriptorProvider)
+        public ResponseRouter(Lazy<IOutputHandler> outputHandler, ISerializer serializer, IHandlerTypeDescriptorProvider<IHandlerTypeDescriptor> handlerTypeDescriptorProvider)
         {
             OutputHandler = outputHandler;
             Serializer = serializer;
             _handlerTypeDescriptorProvider = handlerTypeDescriptorProvider;
         }
 
         public void SendNotification(string method) =>
-            OutputHandler.Send(
+            OutputHandler.Value.Send(
                 new OutgoingNotification {
                     Method = method
                 }
             );
 
         public void SendNotification<T>(string method, T @params) =>
-            OutputHandler.Send(
+            OutputHandler.Value.Send(
                 new OutgoingNotification {
                     Method = method,
                     Params = @params
@@ -81,7 +81,7 @@ public async Task<TResponse> Returning<TResponse>(CancellationToken cancellation
 
                 cancellationToken.ThrowIfCancellationRequested();
 
-                _router.OutputHandler.Send(
+                _router.OutputHandler.Value.Send(
                     new OutgoingRequest {
                         Method = _method,
                         Params = _params,

src/Protocol/LanguageProtocolRpcOptionsBase.cs

@@ -14,7 +14,6 @@ public abstract class LanguageProtocolRpcOptionsBase<T> : JsonRpcServerOptionsBa
     {
         public LanguageProtocolRpcOptionsBase()
         {
-            Services.AddLogging(builder => LoggingBuilderAction?.Invoke(builder));
             WithAssemblies(typeof(LanguageProtocolRpcOptionsBase<>).Assembly);
         }
 

src/Server/Logging/LanguageServerLogger.cs

@@ -12,11 +12,11 @@ namespace OmniSharp.Extensions.LanguageServer.Server
 {
     internal class LanguageServerLogger : ILogger
     {
-        private readonly ILanguageServer _responseRouter;
+        private readonly ILanguageServerFacade _responseRouter;
         private readonly string _categoryName;
         private readonly Func<LogLevel> _logLevelGetter;
 
-        public LanguageServerLogger(ILanguageServer responseRouter, string categoryName, Func<LogLevel> logLevelGetter)
+        public LanguageServerLogger(ILanguageServerFacade responseRouter, string categoryName, Func<LogLevel> logLevelGetter)
         {
             _logLevelGetter = logLevelGetter;
             _responseRouter = responseRouter;
@@ -68,7 +68,8 @@ private bool TryGetMessageType(LogLevel logLevel, out MessageType messageType)
                     return true;
                 case LogLevel.Debug:
                 case LogLevel.Trace:
-                    messageType = MessageType.Info;
+                    // TODO: Integrate with set trace?
+                    messageType = MessageType.Log;
                     return true;
             }
 

src/Server/Logging/LanguageServerLoggerProvider.cs

@@ -5,10 +5,10 @@ namespace OmniSharp.Extensions.LanguageServer.Server
 {
     internal class LanguageServerLoggerProvider : ILoggerProvider
     {
-        private readonly ILanguageServer _languageServer;
+        private readonly ILanguageServerFacade _languageServer;
         private readonly LanguageServerLoggerSettings _settings;
 
-        public LanguageServerLoggerProvider(ILanguageServer languageServer, LanguageServerLoggerSettings settings)
+        public LanguageServerLoggerProvider(ILanguageServerFacade languageServer, LanguageServerLoggerSettings settings)
         {
             _languageServer = languageServer;
             _settings = settings;

src/Shared/LanguageProtocolServiceCollectionExtensions.cs

@@ -25,6 +25,8 @@ internal static IContainer AddLanguageProtocolInternals<T>(this IContainer conta
                 throw new ArgumentException("Serializer is missing!", nameof(options));
             }
 
+            options.Services.AddLogging(builder => options.LoggingBuilderAction?.Invoke(builder));
+
             container = container.AddJsonRpcServerCore(options);
             container.RegisterInstanceMany(new LspHandlerTypeDescriptorProvider(options.Assemblies), nonPublicServiceTypes: true);