Only push output device messages to Test Explorer, don't push logs

src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs

@@ -12,6 +12,7 @@
 using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.Logging;
 using Microsoft.Testing.Platform.Messages;
+using Microsoft.Testing.Platform.OutputDevice;
 using Microsoft.Testing.Platform.Requests;
 using Microsoft.Testing.Platform.ServerMode;
 using Microsoft.Testing.Platform.Services;
@@ -118,13 +119,6 @@ protected override async Task<int> InternalRunAsync()
             await _logger.LogDebugAsync("Starting server mode");
             _messageHandler = await _messageHandlerFactory.CreateMessageHandlerAsync(_testApplicationCancellationTokenSource.CancellationToken);
 
-            // Initialize the ServerLoggerForwarderProvider, it can be null if diagnostic is disabled.
-            ServerLoggerForwarderProvider? serviceLoggerForwarder = ServiceProvider.GetService<ServerLoggerForwarderProvider>();
-            if (serviceLoggerForwarder is not null)
-            {
-                await serviceLoggerForwarder.InitializeAsync(this);
-            }
-
             await HandleMessagesAsync();
 
             (_messageHandler as IDisposable)?.Dispose();
@@ -450,13 +444,20 @@ private async Task<ResponseArgsBase> ExecuteRequestAsync(RequestArgsBase args, s
 
         DateTimeOffset adapterLoadStart = _clock.UtcNow;
 
+        IPlatformOutputDevice outputDevice = ServiceProvider.GetRequiredService<IPlatformOutputDevice>();
+        // TODO: What if some one wants to have their own output device that's also compatible with server mode in IDE?
+        if (outputDevice is ServerModePerCallOutputDevice serverModePerCallOutputDevice)
+        {
+            await serverModePerCallOutputDevice.InitializeAsync(this);
+        }
+
         // Build the per request adapter
-        ITestFramework perRequestTestFramework = await _buildTestFrameworkAsync(new(
+        ITestFramework perRequestTestFramework = await _buildTestFrameworkAsync(new TestFrameworkBuilderData(
             perRequestServiceProvider,
             requestFactory,
             invoker,
             filterFactory,
-            new ServerModePerCallOutputDevice(),
+            outputDevice,
             [testNodeUpdateProcessor],
             _testFrameworkManager,
             _testSessionManager,

src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs

@@ -196,10 +196,6 @@ public async Task<ITestHost> BuildAsync(
         LoggerFactoryProxy loggerFactoryProxy = new();
         serviceProvider.TryAddService(loggerFactoryProxy);
 
-        // Add output display proxy, needed by command line manager.
-        // We don't add to the service right now because we need special treatment between console/server mode.
-        IPlatformOutputDevice platformOutputDevice = ((PlatformOutputDeviceManager)OutputDisplay).Build(serviceProvider);
-
         // Add Terminal options provider
         CommandLine.AddProvider(() => new TerminalTestReporterCommandLineOptionsProvider());
 
@@ -210,6 +206,16 @@ public async Task<ITestHost> BuildAsync(
         // Set the concrete command line options to the proxy.
         commandLineOptionsProxy.SetCommandLineOptions(commandLineHandler);
 
+        bool hasServerFlag = commandLineHandler.TryGetOptionArgumentList(PlatformCommandLineProvider.ServerOptionKey, out string[]? protocolName);
+        bool isJsonRpcProtocol = protocolName is null || protocolName.Length == 0 || protocolName[0].Equals(PlatformCommandLineProvider.JsonRpcProtocolName, StringComparison.OrdinalIgnoreCase);
+
+        // TODO(youssef): In what way the output device is needed by command line manager?
+        // TODO(youssef): Building the platform output device depends on whether we are running server mode in TE or not.
+        // TODO(youssef): So we need to now create commandline handler first. :(
+        // Add output display proxy, needed by command line manager.
+        // We don't add to the service right now because we need special treatment between console/server mode.
+        IPlatformOutputDevice platformOutputDevice = ((PlatformOutputDeviceManager)OutputDisplay).Build(serviceProvider, hasServerFlag && isJsonRpcProtocol);
+
         // Add FileLoggerProvider if needed
         if (loggingState.FileLoggerProvider is not null)
         {
@@ -219,16 +225,6 @@ public async Task<ITestHost> BuildAsync(
         // Get the command line options
         ICommandLineOptions commandLineOptions = serviceProvider.GetCommandLineOptions();
 
-        // Register the server mode log forwarder if needed. We follow the console --diagnostic behavior.
-        bool hasServerFlag = commandLineHandler.TryGetOptionArgumentList(PlatformCommandLineProvider.ServerOptionKey, out string[]? protocolName);
-        bool isJsonRpcProtocol = protocolName is null || protocolName.Length == 0 || protocolName[0].Equals(PlatformCommandLineProvider.JsonRpcProtocolName, StringComparison.OrdinalIgnoreCase);
-        if (hasServerFlag && isJsonRpcProtocol)
-        {
-            ServerLoggerForwarderProvider serverLoggerProxy = new(loggingState.LogLevel, serviceProvider);
-            serviceProvider.AddService(serverLoggerProxy);
-            Logging.AddProvider((logLevel, services) => serverLoggerProxy);
-        }
-
         // Build the logger factory.
         ILoggerFactory loggerFactory = await ((LoggingManager)Logging).BuildAsync(serviceProvider, loggingState.LogLevel, systemMonitor);
 

src/Platform/Microsoft.Testing.Platform/OutputDevice/OutputDeviceManager.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Testing.Platform.ServerMode;
 using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.OutputDevice;
@@ -15,15 +16,19 @@ public void SetPlatformOutputDevice(Func<IServiceProvider, IPlatformOutputDevice
         _platformOutputDeviceFactory = platformOutputDeviceFactory;
     }
 
-    public IPlatformOutputDevice Build(ServiceProvider serviceProvider)
+    public IPlatformOutputDevice Build(ServiceProvider serviceProvider, bool useServerModeOutputDevice)
     {
         if (_platformOutputDeviceFactory is not null)
         {
+            // TODO: SetPlatformOutputDevice isn't public yet.
+            // Before exposing it, do we want to pass the "useServerModeOutputDevice" info to it?
             IPlatformOutputDevice platformOutputDevice = _platformOutputDeviceFactory(serviceProvider);
             return platformOutputDevice;
         }
 
-        return GetDefaultTerminalOutputDevice(serviceProvider);
+        return useServerModeOutputDevice
+            ? new ServerModePerCallOutputDevice(serviceProvider)
+            : GetDefaultTerminalOutputDevice(serviceProvider);
     }
 
     public static TerminalOutputDevice GetDefaultTerminalOutputDevice(ServiceProvider serviceProvider)

src/Platform/Microsoft.Testing.Platform/Resources/PlatformResources.resx

@@ -671,4 +671,13 @@ Takes one argument as string in the format <value>[h|m|s] where 'value' is
   <data name="ConfigurationFileNotFound" xml:space="preserve">
     <value>The configuration file '{0}' specified with '--config-file' could not be found.</value>
   </data>
-</root>
+  <data name="StartingTestSession" xml:space="preserve">
+    <value>Starting test session.</value>
+  </data>
+  <data name="StartingTestSessionWithLogFilePath" xml:space="preserve">
+    <value>Starting test session. The log file path is '{0}'.</value>
+  </data>
+  <data name="FinishedTestSession" xml:space="preserve">
+    <value>Finished test session.</value>
+  </data>
+</root>

src/Platform/Microsoft.Testing.Platform/Resources/xlf/PlatformResources.cs.xlf

@@ -271,6 +271,11 @@
         <target state="translated">selhalo s {0} upozorněním(i).</target>
         <note />
       </trans-unit>
+      <trans-unit id="FinishedTestSession">
+        <source>Finished test session.</source>
+        <target state="new">Finished test session.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="ForTest">
         <source>For test</source>
         <target state="translated">Pro testování</target>
@@ -688,6 +693,16 @@ Může mít jenom jeden argument jako řetězec ve formátu &lt;value&gt;[h|m|s]
         <target state="translated">Spouští se server. Naslouchání na portu {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="StartingTestSession">
+        <source>Starting test session.</source>
+        <target state="new">Starting test session.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="StartingTestSessionWithLogFilePath">
+        <source>Starting test session. The log file path is '{0}'.</source>
+        <target state="new">Starting test session. The log file path is '{0}'.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="TEstExecutionFilterFactoryFactoryAlreadySetErrorMessage">
         <source>An 'ITestExecutionFilterFactory' factory is already set</source>
         <target state="translated">Objekt pro vytváření ITestExecutionFilterFactory je už nastavený.</target>