Merge branch 'trunk' into py_add_cdp_patch_rules

Author: cgoldberg

dotnet/src/webdriver/Safari/SafariDriverService.cs

@@ -20,10 +20,7 @@
 using OpenQA.Selenium.Internal;
 using System;
 using System.IO;
-using System.Net;
-using System.Net.Http;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Safari;
 
@@ -34,6 +31,13 @@ public sealed class SafariDriverService : DriverService
 {
     private const string DefaultSafariDriverServiceExecutableName = "safaridriver";
 
+    /// <summary>
+    /// Enable diagnose logging.
+    /// When set to <see langword="true"/>, the <b>SafariDriver</b> will be started with the <i>--diagnose</i> flag.
+    /// Logs will be written to <i>~/Library/Logs/com.apple.WebDriver/</i>.
+    /// </summary>
+    public bool? Diagnose { get; set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="SafariDriverService"/> class.
     /// </summary>
@@ -59,6 +63,12 @@ protected override string CommandLineArguments
         get
         {
             StringBuilder argsBuilder = new StringBuilder(base.CommandLineArguments);
+
+            if (this.Diagnose is true)
+            {
+                argsBuilder.Append(" --diagnose");
+            }
+
             return argsBuilder.ToString();
         }
     }

java/src/org/openqa/selenium/remote/HttpCommandExecutor.java

@@ -47,8 +47,8 @@ public class HttpCommandExecutor implements CommandExecutor, NeedsLocalLogs {
 
   private final URL remoteServer;
   public final HttpClient client;
-  private final HttpClient.Factory httpClientFactory;
-  private final Map<String, CommandInfo> additionalCommands;
+  protected final HttpClient.Factory httpClientFactory;
+  protected final Map<String, CommandInfo> additionalCommands;
   protected CommandCodec<HttpRequest> commandCodec;
   protected ResponseCodec<HttpResponse> responseCodec;