[dotnet] Stream Selenium Manager output to internal logging (#17024)

Author: nvborisenko

dotnet/src/webdriver/DriverFinder.cs

@@ -20,9 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.IO;
-using System.Text;
+using OpenQA.Selenium.Manager;
 
 namespace OpenQA.Selenium;
 
@@ -32,6 +31,9 @@ namespace OpenQA.Selenium;
 /// </summary>
 public class DriverFinder
 {
+    private const string DriverPathKey = "driver_path";
+    private const string BrowserPathKey = "browser_path";
+
     private readonly DriverOptions options;
     private readonly Dictionary<string, string> paths = new Dictionary<string, string>();
 
@@ -52,7 +54,7 @@ public DriverFinder(DriverOptions options)
     /// </returns>
     public string GetBrowserPath()
     {
-        return BinaryPaths()[SeleniumManager.BrowserPathKey];
+        return BinaryPaths()[BrowserPathKey];
     }
 
     /// <summary>
@@ -63,7 +65,7 @@ public string GetBrowserPath()
     /// </returns>
     public string GetDriverPath()
     {
-        return BinaryPaths()[SeleniumManager.DriverPathKey];
+        return BinaryPaths()[DriverPathKey];
     }
 
     /// <summary>
@@ -102,18 +104,29 @@ public bool TryGetBrowserPath([NotNullWhen(true)] out string? browserPath)
     /// <exception cref="NoSuchDriverException">If one of the paths does not exist.</exception>
     private Dictionary<string, string> BinaryPaths()
     {
-        if (paths.ContainsKey(SeleniumManager.DriverPathKey) && !string.IsNullOrWhiteSpace(paths[SeleniumManager.DriverPathKey]))
+        if (paths.TryGetValue(DriverPathKey, out string? cachedDriverPath) && !string.IsNullOrWhiteSpace(cachedDriverPath))
         {
             return paths;
         }
 
-        Dictionary<string, string> binaryPaths = SeleniumManager.BinaryPaths(CreateArguments());
-        string driverPath = binaryPaths[SeleniumManager.DriverPathKey];
-        string browserPath = binaryPaths[SeleniumManager.BrowserPathKey];
+        if (string.IsNullOrWhiteSpace(options.BrowserName))
+        {
+            throw new NoSuchDriverException("Browser name must be specified to find the driver using Selenium Manager.");
+        }
+
+        BrowserDiscoveryResult smResult = SeleniumManager.DiscoverBrowser(options.BrowserName, new BrowserDiscoveryOptions
+        {
+            BrowserVersion = options.BrowserVersion,
+            BrowserPath = options.BinaryLocation,
+            Proxy = options.Proxy?.SslProxy ?? options.Proxy?.HttpProxy
+        });
+
+        string driverPath = smResult.DriverPath;
+        string browserPath = smResult.BrowserPath;
 
         if (File.Exists(driverPath))
         {
-            paths.Add(SeleniumManager.DriverPathKey, driverPath);
+            paths.Add(DriverPathKey, driverPath);
         }
         else
         {
@@ -122,7 +135,7 @@ private Dictionary<string, string> BinaryPaths()
 
         if (File.Exists(browserPath))
         {
-            paths.Add(SeleniumManager.BrowserPathKey, browserPath);
+            paths.Add(BrowserPathKey, browserPath);
         }
         else
         {
@@ -131,43 +144,4 @@ private Dictionary<string, string> BinaryPaths()
 
         return paths;
     }
-
-    /// <summary>
-    /// Create arguments to invoke Selenium Manager
-    /// </summary>
-    /// <returns>
-    /// A string with all arguments to invoke Selenium Manager
-    /// </returns>
-    /// <exception cref="NoSuchDriverException"></exception>
-    private string CreateArguments()
-    {
-        StringBuilder argsBuilder = new StringBuilder();
-        argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser \"{0}\"", options.BrowserName);
-
-        if (!string.IsNullOrEmpty(options.BrowserVersion))
-        {
-            argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser-version {0}", options.BrowserVersion);
-        }
-
-        string? browserBinary = options.BinaryLocation;
-        if (!string.IsNullOrEmpty(browserBinary))
-        {
-            argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --browser-path \"{0}\"", browserBinary);
-        }
-
-        if (options.Proxy != null)
-        {
-            if (options.Proxy.SslProxy != null)
-            {
-                argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --proxy \"{0}\"", options.Proxy.SslProxy);
-            }
-            else if (options.Proxy.HttpProxy != null)
-            {
-                argsBuilder.AppendFormat(CultureInfo.InvariantCulture, " --proxy \"{0}\"", options.Proxy.HttpProxy);
-            }
-        }
-
-        return argsBuilder.ToString();
-    }
-
 }

dotnet/src/webdriver/Internal/Logging/ILogContext.cs

@@ -65,9 +65,10 @@ public interface ILogContext : IDisposable
     /// Emits a log message using the specified logger, log level, and message.
     /// </summary>
     /// <param name="logger">The logger to emit the log message.</param>
+    /// <param name="timestamp">The timestamp of the log event.</param>
     /// <param name="level">The log level of the message.</param>
     /// <param name="message">The log message.</param>
-    internal void EmitMessage(ILogger logger, LogEventLevel level, string message);
+    internal void EmitMessage(ILogger logger, DateTimeOffset timestamp, LogEventLevel level, string message);
 
     /// <summary>
     /// Sets the minimum log level for the current context.

dotnet/src/webdriver/Internal/Logging/ILogger.cs

@@ -56,6 +56,14 @@ internal interface ILogger
     /// <param name="message">The log message.</param>
     void Error(string message);
 
+    /// <summary>
+    /// Writes a log message with a specific timestamp and log level.
+    /// </summary>
+    /// <param name="timestamp">The timestamp of the log event.</param>
+    /// <param name="level">The severity level of the log message.</param>
+    /// <param name="message">The log message.</param>
+    void LogMessage(DateTimeOffset timestamp, LogEventLevel level, string message);
+
     /// <summary>
     /// Gets or sets the log event level.
     /// </summary>

dotnet/src/webdriver/Internal/Logging/LogContext.cs

@@ -97,13 +97,13 @@ public bool IsEnabled(ILogger logger, LogEventLevel level)
         return Handlers != null && level >= _level && (_loggers?.TryGetValue(logger.Issuer, out var loggerEntry) != true || level >= loggerEntry?.Level);
     }
 
-    public void EmitMessage(ILogger logger, LogEventLevel level, string message)
+    public void EmitMessage(ILogger logger, DateTimeOffset timestamp, LogEventLevel level, string message)
     {
         if (IsEnabled(logger, level))
         {
-            message = TruncateMessage(message, _truncationLength);
+            string truncatedMessage = TruncateMessage(message, _truncationLength);
 
-            var logEvent = new LogEvent(logger.Issuer, DateTimeOffset.Now, level, message);
+            var logEvent = new LogEvent(logger.Issuer, timestamp, level, truncatedMessage);
 
             foreach (var handler in Handlers)
             {

dotnet/src/webdriver/Internal/Logging/Logger.cs

@@ -67,8 +67,13 @@ public bool IsEnabled(LogEventLevel level)
         return Log.CurrentContext.IsEnabled(this, level);
     }
 
+    public void LogMessage(DateTimeOffset timestamp, LogEventLevel level, string message)
+    {
+        Log.CurrentContext.EmitMessage(this, timestamp.ToLocalTime(), level, message);
+    }
+
     private void LogMessage(LogEventLevel level, string message)
     {
-        Log.CurrentContext.EmitMessage(this, level, message);
+        LogMessage(DateTimeOffset.Now, level, message);
     }
 }