Merge branch 'trunk' into fix-python-type-annotations

Author: cgoldberg

.github/workflows/update-documentation.yml

@@ -19,6 +19,11 @@ on:
           - dotnet
           - node
           - all
+      force:
+        description: Force generation even if version is nightly, type "force" to enable
+        required: false
+        type: string
+        default: ""
 
   workflow_call:
     inputs:
@@ -74,7 +79,7 @@ jobs:
           npm install
           npm install --prefix javascript/selenium-webdriver
       - name: Generate Documentation for selected langauges
-        run: ./go ${{ inputs.language }}:docs
+        run: ./go ${{ inputs.language }}:docs ${{ inputs.force }}
       - name: Documentation Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v6

Rakefile

@@ -1118,12 +1118,13 @@ namespace :all do
   end
 
   desc 'Update all API Documentation'
-  task :docs do
-    Rake::Task['java:docs'].invoke('skip_update')
-    Rake::Task['py:docs'].invoke('skip_update')
-    Rake::Task['rb:docs'].invoke('skip_update')
-    Rake::Task['dotnet:docs'].invoke('skip_update')
-    Rake::Task['node:docs'].invoke('skip_update')
+  task :docs do |_task, arguments|
+    args = arguments.to_a
+    Rake::Task['java:docs'].invoke(*(args + ['skip_update']))
+    Rake::Task['py:docs'].invoke(*(args + ['skip_update']))
+    Rake::Task['rb:docs'].invoke(*(args + ['skip_update']))
+    Rake::Task['dotnet:docs'].invoke(*(args + ['skip_update']))
+    Rake::Task['node:docs'].invoke(*(args + ['skip_update']))
 
     update_gh_pages
   end

common/selenium_manager.bzl

@@ -20,7 +20,7 @@ def selenium_manager():
     http_file(
         name = "download_sm_windows",
         executable = True,
-        sha256 = "eb6e3b19bb70c3fee7fdb332153d7c7c523034044059900e80b663b8817e720c",
+        sha256 = "89dd1d25e321a07cc88fd76fb6143008298092faecb1573835e0f86483d0abfa",
         url = "https://github.com/SeleniumHQ/selenium_manager_artifacts/releases/download/selenium-manager-acecd4f/selenium-manager-windows.exe",
     )
 

java/src/org/openqa/selenium/grid/node/DefaultActiveSession.java

@@ -28,14 +28,13 @@
 import org.openqa.selenium.remote.Dialect;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpClient;
-import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.tracing.Tracer;
 
 public class DefaultActiveSession extends BaseActiveSession {
 
-  private final HttpHandler handler;
+  private final ReverseProxyHandler handler;
   private final String killUrl;
 
   protected DefaultActiveSession(
@@ -68,6 +67,6 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
 
   @Override
   public void stop() {
-    // no-op
+    handler.close();
   }
 }

java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java

@@ -190,7 +190,6 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
         caps = readPrefixedCaps(capabilities, caps);
 
         span.addEvent("Driver service created session", attributeMap);
-        final HttpClient fClient = client;
         return Either.right(
             new DefaultActiveSession(
                 tracer,
@@ -204,9 +203,8 @@ public Either<WebDriverException, ActiveSession> apply(CreateSessionRequest sess
                 Instant.now()) {
               @Override
               public void stop() {
-                try (fClient) {
-                  service.stop();
-                }
+                super.stop();
+                service.stop();
               }
             });
       } catch (Exception e) {

java/src/org/openqa/selenium/grid/node/docker/DockerSession.java

@@ -67,6 +67,7 @@ public void stop() {
     }
     saveLogs();
     container.stop(Duration.ofMinutes(1));
+    super.stop();
   }
 
   private void saveLogs() {

java/src/org/openqa/selenium/grid/router/HandleSession.java

@@ -90,6 +90,7 @@ public UsageCountingReverseProxyHandler(
 
     @Override
     public void close() {
+      // must not call super.close() here, to ensure the HttpClient stays alive
       // set the last use here, to ensure we have to calculate the real inactivity of the client
       entry.lastUse = Instant.now();
       entry.inUse.decrementAndGet();

java/src/org/openqa/selenium/grid/web/ReverseProxyHandler.java

@@ -33,7 +33,7 @@
 import org.openqa.selenium.remote.tracing.Span;
 import org.openqa.selenium.remote.tracing.Tracer;
 
-public class ReverseProxyHandler implements HttpHandler {
+public class ReverseProxyHandler implements HttpHandler, AutoCloseable {
 
   private static final Logger LOG = Logger.getLogger(ReverseProxyHandler.class.getName());
 
@@ -101,4 +101,9 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
       return resp;
     }
   }
+
+  @Override
+  public void close() {
+    upstream.close();
+  }
 }