Merge branch 'trunk' into sm_mixed_output

.github/workflows/ci-rbe.yml

@@ -10,6 +10,7 @@ on:
 jobs:
   format:
     name: Format
+    if: github.repository_owner == 'seleniumhq'
     uses: ./.github/workflows/bazel.yml
     with:
       name: Check format script run
@@ -19,6 +20,7 @@ jobs:
 
   test:
     name: Test
+    if: github.repository_owner == 'seleniumhq'
     uses: ./.github/workflows/bazel.yml
     with:
       # TODO: experiment with turning off caches

.github/workflows/ci-rust.yml

@@ -212,7 +212,7 @@ jobs:
     name: "Release Binaries"
     runs-on: ubuntu-latest
     needs: [macos-stable, linux-stable, windows-stable, macos-debug, linux-debug, windows-debug]
-    if: github.event_name != 'schedule'
+    if: github.event_name != 'schedule' && github.repository_owner == 'seleniumhq' && github.ref == 'refs/heads/trunk'
     steps:
       - name: "Checkout selenium_manager_artifacts"
         uses: actions/checkout@v4

.github/workflows/label-commenter.yml

@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   comment:
+    if: github.repository_owner == 'seleniumhq'
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4

.github/workflows/lock.yml

@@ -12,6 +12,7 @@ permissions:
 
 jobs:
   action:
+    if: github.repository_owner == 'seleniumhq'
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v5

.github/workflows/mirror-selenium-releases.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   build:
+    if: github.repository_owner == 'seleniumhq'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
@@ -24,7 +25,7 @@ jobs:
         export CHANGES=$(git status -s)
         if [ -n "$CHANGES" ]; then
           git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"        
+          git config --local user.name "Selenium CI Bot"
           git add common/mirror/selenium
           git commit -m "Update mirror info (`date`)" -a
           echo "::set-output name=commit::true"

.github/workflows/nightly.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   ruby:
-    if: inputs.language == 'ruby' || github.event_name == 'schedule'
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'ruby' || github.event_name == 'schedule')
     name: Ruby
     uses: ./.github/workflows/bazel.yml
     strategy:
@@ -37,8 +37,9 @@ jobs:
         bazel run //rb:${{ matrix.gem }}-bump-nightly-version ${{ inputs.version }}
         bazel run //rb:${{ matrix.gem }}-release-nightly
 
+
   java:
-    if: inputs.language == 'java' || github.event_name == 'schedule'
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'java' || github.event_name == 'schedule')
     name: Java
     uses: ./.github/workflows/bazel.yml
     with:
@@ -49,7 +50,7 @@ jobs:
     secrets: inherit
 
   grid:
-    if: inputs.language == 'grid' || github.event_name == 'schedule'
+    if: (github.repository_owner == 'seleniumhq') && (inputs.language == 'grid' || github.event_name == 'schedule')
     name: Grid
     uses: ./.github/workflows/bazel.yml
     with:

.github/workflows/stale.yml

@@ -10,6 +10,7 @@ permissions:
 
 jobs:
   stale:
+    if: github.repository_owner == 'seleniumhq'
     permissions:
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs

dotnet/src/webdriver/Chrome/ChromeDriverService.cs

@@ -56,18 +56,6 @@ public static ChromeDriverService CreateDefaultService()
             return new ChromeDriverService(null, null, PortUtilities.FindFreePort());
         }
 
-        /// <summary>
-        /// Creates a default instance of the ChromeDriverService.
-        /// </summary>
-        /// /// <param name="options">Browser options used to find the correct ChromeDriver binary.</param>
-        /// <returns>A ChromeDriverService that implements default settings.</returns>
-        [Obsolete("CreateDefaultService() now evaluates options in Driver constructor")]
-        public static ChromeDriverService CreateDefaultService(ChromeOptions options)
-        {
-            string fullServicePath = DriverFinder.FullPath(options);
-            return CreateDefaultService(Path.GetDirectoryName(fullServicePath), Path.GetFileName(fullServicePath));
-        }
-
         /// <summary>
         /// Creates a default instance of the ChromeDriverService using a specified path to the ChromeDriver executable.
         /// </summary>

dotnet/src/webdriver/Chromium/ChromiumOptions.cs

@@ -185,27 +185,6 @@ public ChromiumAndroidOptions AndroidOptions
             set { this.androidOptions = value; }
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the <see cref="ChromiumDriver"/> instance
-        /// should use the legacy OSS protocol dialect or a dialect compliant with the W3C
-        /// WebDriver Specification.
-        /// </summary>
-        [Obsolete("Spec Compliant Protocol is the only supported protocol")]
-        public bool UseSpecCompliantProtocol
-        {
-            get { return this.useSpecCompliantProtocol; }
-            set
-            {
-                if (!value)
-                {
-                    throw new ArgumentException("Only the spec compliant protocol is supported, " +
-                                                "Please update to W3C Syntax: " +
-                                                "https://www.selenium.dev/blog/2022/legacy-protocol-support/");
-                }
-                this.useSpecCompliantProtocol = true;
-            }
-        }
-
         /// <summary>
         /// Adds a single argument to the list of arguments to be appended to the browser executable command line.
         /// </summary>

dotnet/src/webdriver/DriverService.cs

@@ -239,7 +239,10 @@ protected virtual bool IsInitialized
                 }
                 catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException)
                 {
-                    logger.Trace(ex.ToString());
+                    if (logger.IsEnabled(LogEventLevel.Trace))
+                    {
+                        logger.Trace(ex.ToString());
+                    }
                 }
 
                 return isInitialized;

dotnet/src/webdriver/Edge/EdgeDriverService.cs

@@ -65,18 +65,6 @@ public static EdgeDriverService CreateDefaultService()
             return new EdgeDriverService(null, null, PortUtilities.FindFreePort());
         }
 
-        /// <summary>
-        /// Creates a default instance of the EdgeDriverService.
-        /// </summary>
-        /// <param name="options">Browser options used to find the correct MSEdgeDriver binary.</param>
-        /// <returns>A EdgeDriverService that implements default settings.</returns>
-        [Obsolete("CreateDefaultService() now evaluates options in Driver constructor")]
-        public static EdgeDriverService CreateDefaultService(EdgeOptions options)
-        {
-            string fullServicePath = DriverFinder.FullPath(options);
-            return CreateDefaultService(Path.GetDirectoryName(fullServicePath), Path.GetFileName(fullServicePath));
-        }
-
         /// <summary>
         /// Creates a default instance of the EdgeDriverService using a specified path to the EdgeDriver executable.
         /// </summary>

dotnet/src/webdriver/Firefox/FirefoxDriverService.cs

@@ -218,18 +218,6 @@ public static FirefoxDriverService CreateDefaultService()
         }
 
 
-        /// <summary>
-        /// Creates a default instance of the FirefoxDriverService.
-        /// </summary>
-        /// <param name="options">Browser options used to find the correct GeckoDriver binary.</param>
-        /// <returns>A FirefoxDriverService that implements default settings.</returns>
-        [Obsolete("CreateDefaultService() now evaluates options in Driver constructor")]
-        public static FirefoxDriverService CreateDefaultService(FirefoxOptions options)
-        {
-            string fullServicePath = DriverFinder.FullPath(options);
-            return CreateDefaultService(Path.GetDirectoryName(fullServicePath), Path.GetFileName(fullServicePath));
-        }
-
         /// <summary>
         /// Creates a default instance of the FirefoxDriverService using a specified path to the Firefox driver executable.
         /// </summary>

dotnet/src/webdriver/IE/InternetExplorerDriverService.cs

@@ -158,18 +158,6 @@ public static InternetExplorerDriverService CreateDefaultService()
             return new InternetExplorerDriverService(null, null, PortUtilities.FindFreePort());
         }
 
-        /// <summary>
-        /// Creates a default instance of the InternetExplorerDriverService.
-        /// </summary>
-        /// <param name="options">Browser options used to find the correct IEDriver binary.</param>
-        /// <returns>A InternetExplorerDriverService that implements default settings.</returns>
-        [Obsolete("CreateDefaultService() now evaluates options in Driver constructor")]
-        public static InternetExplorerDriverService CreateDefaultService(InternetExplorerOptions options)
-        {
-            string fullServicePath = DriverFinder.FullPath(options);
-            return CreateDefaultService(Path.GetDirectoryName(fullServicePath), Path.GetFileName(fullServicePath));
-        }
-
         /// <summary>
         /// Creates a default instance of the InternetExplorerDriverService using a specified path to the IEDriverServer executable.
         /// </summary>

dotnet/src/webdriver/Internal/FileUtilities.cs

@@ -102,7 +102,10 @@ public static void DeleteDirectory(string directoryToDelete)
 
             if (Directory.Exists(directoryToDelete))
             {
-                logger.Trace($"Unable to delete directory '{directoryToDelete}'");
+                if (logger.IsEnabled(LogEventLevel.Trace))
+                {
+                    logger.Trace($"Unable to delete directory '{directoryToDelete}'");
+                }
             }
         }
 

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

@@ -52,6 +52,14 @@ public interface ILogContext : IDisposable
         /// <returns>An instance of <see cref="ILogger"/> for the specified type.</returns>
         internal ILogger GetLogger(Type type);
 
+        /// <summary>
+        /// Checks whether logs emitting is enabled for a logger and a log event level.
+        /// </summary>
+        /// <param name="logger">The specified logger instance to be checked.</param>
+        /// <param name="level">The specified log event level to be checked.</param>
+        /// <returns><c>true</c> if log messages emmiting is enabled for the specified logger and log event level, otherwise <c>false</c>.</returns>
+        internal bool IsEnabled(ILogger logger, LogEventLevel level);
+
         /// <summary>
         /// Emits a log message using the specified logger, log level, and message.
         /// </summary>

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

@@ -64,5 +64,12 @@ internal interface ILogger
         /// Gets the type of the logger issuer.
         /// </summary>
         Type Issuer { get; }
+
+        /// <summary>
+        /// Checks whether logs emitting is enabled for this logger and a log event level.
+        /// </summary>
+        /// <param name="level">The specified log event level to be checked.</param>
+        /// <returns><c>true</c> if log messages emmiting is enabled for the specified log event level, otherwise <c>false</c>.</returns>
+        bool IsEnabled(LogEventLevel level);
     }
 }

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

@@ -96,9 +96,14 @@ public ILogger GetLogger(Type type)
             return _loggers.GetOrAdd(type, _ => new Logger(type, _level));
         }
 
+        public bool IsEnabled(ILogger logger, LogEventLevel level)
+        {
+            return Handlers != null && level >= _level && level >= logger.Level;
+        }
+
         public void EmitMessage(ILogger logger, LogEventLevel level, string message)
         {
-            if (Handlers != null && level >= _level && level >= GetLogger(logger.Issuer).Level)
+            if (IsEnabled(logger, level))
             {
                 var logEvent = new LogEvent(logger.Issuer, DateTimeOffset.Now, level, message);
 

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

@@ -61,6 +61,11 @@ public void Error(string message)
             LogMessage(LogEventLevel.Error, message);
         }
 
+        public bool IsEnabled(LogEventLevel level)
+        {
+            return Log.CurrentContext.IsEnabled(this, level);
+        }
+
         private void LogMessage(LogEventLevel level, string message)
         {
             Log.CurrentContext.EmitMessage(this, level, message);

dotnet/src/webdriver/Remote/HttpCommandExecutor.cs

@@ -18,14 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using OpenQA.Selenium.Internal;
 using OpenQA.Selenium.Internal.Logging;
@@ -166,7 +164,10 @@ public virtual Response Execute(Command commandToExecute)
                 throw new ArgumentNullException(nameof(commandToExecute), "commandToExecute cannot be null");
             }
 
-            _logger.Debug($"Executing command: {commandToExecute}");
+            if (_logger.IsEnabled(LogEventLevel.Debug))
+            {
+                _logger.Debug($"Executing command: {commandToExecute}");
+            }
 
             HttpCommandInfo info = this.commandInfoRepository.GetCommandInfo<HttpCommandInfo>(commandToExecute.Name);
             if (info == null)
@@ -198,7 +199,10 @@ public virtual Response Execute(Command commandToExecute)
 
             Response toReturn = this.CreateResponse(responseInfo);
 
-            _logger.Debug($"Response: {toReturn}");
+            if (_logger.IsEnabled(LogEventLevel.Debug))
+            {
+                _logger.Debug($"Response: {toReturn}");
+            }
 
             return toReturn;
         }
@@ -279,11 +283,17 @@ private async Task<HttpResponseInfo> MakeHttpRequest(HttpRequestInfo requestInfo
                     requestMessage.Content.Headers.ContentType = contentTypeHeader;
                 }
 
-                _logger.Trace($">> {requestMessage}");
+                if (_logger.IsEnabled(LogEventLevel.Trace))
+                {
+                    _logger.Trace($">> {requestMessage}");
+                }
 
                 using (HttpResponseMessage responseMessage = await this.client.SendAsync(requestMessage).ConfigureAwait(false))
                 {
-                    _logger.Trace($"<< {responseMessage}");
+                    if (_logger.IsEnabled(LogEventLevel.Trace))
+                    {
+                        _logger.Trace($"<< {responseMessage}");
+                    }
 
                     HttpResponseInfo httpResponseInfo = new HttpResponseInfo();
                     httpResponseInfo.Body = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);