Merge branch 'trunk' into improve-recorder

Author: VietND96

.github/actions/get-latest-upstream/action.yml

@@ -16,22 +16,24 @@ runs:
   steps:
     - name: Get latest upstream
       shell: bash
+      env:
+        AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
       run: |
         sudo apt update
         sudo apt install jq
         AUTH_HEADER="Authorization: token ${{ inputs.gh_cli_token }}"
         if [ "${{ inputs.release }}" = "true" ]; then
           echo "Getting the latest stable release."
-          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
+          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
         else
           echo "Getting the latest Nightly release."
-          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == true)] | .[0].tag_name' || echo "")
+          RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases | jq -r '[.[]? | select(.prerelease == true)] | .[0].tag_name' || echo "")
           if [ -z "${RELEASE}" ] || [ "${RELEASE}" = "null" ]; then
             echo "Nightly release not found, getting the latest stable release."
-            RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
+            RELEASE=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases | jq -r '[.[]? | select(.prerelease == false)] | .[0].tag_name')
           fi
         fi
-        jar_file=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/SeleniumHQ/selenium/releases/tags/${RELEASE} | jq -r '.assets[] | select(.name | endswith(".jar")) | .name' | tail -n 1)
+        jar_file=$(curl -s -H "$AUTH_HEADER" https://api.github.com/repos/${AUTHORS}/selenium/releases/tags/${RELEASE} | jq -r '.assets[] | select(.name | endswith(".jar")) | .name' | tail -n 1)
         echo "Server package: ${jar_file}"
         VERSION=$(echo $jar_file | sed 's/selenium-server-//;s/\.jar//')
         echo "BASE_RELEASE=${RELEASE} | BASE_VERSION=${VERSION} | VERSION=${VERSION}"

.github/workflows/release-chrome-versions.yml

@@ -31,7 +31,7 @@ on:
       browser-versions:
         description: 'List browser version to build. E.g: [130, 131]'
         required: true
-        default: '[95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143]'
+        default: '[95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144]'
       push-image:
         description: 'Push image after testing successfully'
         required: true

.github/workflows/release-firefox-versions.yml

@@ -31,7 +31,7 @@ on:
       browser-versions:
         description: 'List browser version to build. E.g: [130, 131]'
         required: true
-        default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146]'
+        default: '[98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147]'
       push-image:
         description: 'Push image after testing successfully'
         required: true

Base/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:7a398144c5a2fa7dbd9362e460779dc6659bd9b19df50f724250c62ca7812eb3
+FROM ubuntu:noble@sha256:cd1dba651b3080c3686ecf4e3c4220f026b521fb76978881737d24f200828b2b
 ARG AUTHORS=SeleniumHQ
 LABEL authors="${AUTHORS} <[email protected]>"
 LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-selenium"
@@ -7,11 +7,11 @@ LABEL org.opencontainers.image.source="https://github.com/${AUTHORS}/docker-sele
 ARG VERSION
 ARG RELEASE=selenium-${VERSION}
 # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel)
-ARG OPENTELEMETRY_VERSION=1.56.0
-ARG GRPC_VERSION=1.77.0
-ARG NETTY_VERSION=4.2.7.Final
-ARG CS_VERSION=2.1.25-M18
-ARG ENVSUBST_VERSION=1.4.8
+ARG OPENTELEMETRY_VERSION=1.58.0
+ARG GRPC_VERSION=1.78.0
+ARG NETTY_VERSION=4.2.9.Final
+ARG CS_VERSION=2.1.24
+ARG ENVSUBST_VERSION=1.4.9
 ARG CURL_VERSION=8.17.0
 ARG PYTHON_VERSION=3.14
 

ENV_VARIABLES.md

@@ -79,7 +79,7 @@
 | SE_NODE_ENABLE_CDP |  | Enable CDP proxying in Grid. A Grid admin can disable CDP if the network doesnot allow websockets. True by default. | --enable-cdp |
 | SE_NODE_REGISTER_PERIOD | 120 |  | --register-period |
 | SE_NODE_REGISTER_CYCLE | 10 |  | --register-cycle |
-| SE_NODE_HEARTBEAT_PERIOD | 30 |  | --heartbeat-period |
+| SE_NODE_HEARTBEAT_PERIOD | 15 |  | --heartbeat-period |
 | SE_REGISTRATION_SECRET |  |  | --registration-secret |
 | SE_BROWSER_LEFTOVERS_PROCESSES_SECS | 7200 |  |  |
 | SE_BROWSER_LEFTOVERS_TEMPFILES_DAYS | 1 |  |  |
@@ -155,3 +155,7 @@
 | SE_NODE_DELETE_SESSION_ON_UI | true | Enable capability to support deleting session on Grid UI | --delete-session-on-ui |
 | SE_UPDATE_CHROME_COMPONENTS |  | Applicable for node-chrome, standalone-chrome (arch linux/amd64). Update the latest version of Chrome and ChromeDriver at the beginning of the container startup. Read more: [#2872](https://github.com/SeleniumHQ/docker-selenium/pull/2872) |  |
 | SE_DISTRIBUTOR_SLOT_SELECTOR |  | Full class name of non-default slot selector. This is used to select a slot in a Node once the Node has been matched. Switch to built-in Greedy strategy, use class name `org.openqa.selenium.grid.distributor.selector.GreedySlotSelector` | --slot-selector |
+| SE_EVENT_BUS_HEARTBEAT_PERIOD |  | How often, in seconds, will the EventBus socket send heartbeats | --eventbus-heartbeat-period |
+| SE_NODE_ENABLE_BROWSER |  | Checkout usage of SE_NODE_ENABLE_BROWSER_* in below |  |
+| SE_NODE_ENABLE_BROWSER_ |  | This is used in node/standalone all browsers in one container, append suffix CHROME, FIREFOX or EDGE to disable correspoding browser in Node stereotypes. For example: SE_NODE_ENABLE_BROWSER_CHROME=false |  |
+| SE_NODE_DOWN_FAILURE_THRESHOLD | 0 | Maximum number of consecutive session creation failures before the Node is marked as DOWN. This helps detect and isolate unhealthy Nodes that consistently fail to create sessions. A value of 0 (default) disables this feature, allowing unlimited retries. A value higher than zero enables this feature. | --node-down-failure-threshold |

Makefile

@@ -1,13 +1,13 @@
 NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
-BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.39.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.39.0)
-BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.39.0)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.40.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.40.0)
+BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.40.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.40.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.39.0)
-MVN_SELENIUM_VERSION := $(or $(MVN_SELENIUM_VERSION),$(MVN_SELENIUM_VERSION),4.39.0)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.41.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.40.0)
+MVN_SELENIUM_VERSION := $(or $(MVN_SELENIUM_VERSION),$(MVN_SELENIUM_VERSION),4.40.0)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))

NodeBase/Dockerfile

@@ -42,10 +42,11 @@ ENV LANG_WHICH=${LANG_WHICH} \
     SE_EVENT_BUS_SUBSCRIBE_PORT="4443" \
     # Drain the Node after N sessions (a value higher than zero enables the feature)
     SE_DRAIN_AFTER_SESSION_COUNT="0" \
+    SE_NODE_DOWN_FAILURE_THRESHOLD="0" \
     SE_NODE_MAX_SESSIONS="1" \
     SE_NODE_SESSION_TIMEOUT="300" \
     SE_NODE_OVERRIDE_MAX_SESSIONS="false" \
-    SE_NODE_HEARTBEAT_PERIOD="30" \
+    SE_NODE_HEARTBEAT_PERIOD="15" \
     SE_NODE_REGISTER_PERIOD="120" \
     SE_NODE_REGISTER_CYCLE="10" \
     SE_NODE_REGISTER_SHUTDOWN_ON_FAILURE="true" \

NodeBase/start-selenium-node.sh

@@ -88,6 +88,10 @@ if [ ! -z "$SE_NODE_HEARTBEAT_PERIOD" ]; then
   append_se_opts "--heartbeat-period" "${SE_NODE_HEARTBEAT_PERIOD}"
 fi
 
+if [ ! -z "$SE_NODE_DOWN_FAILURE_THRESHOLD" ]; then
+  append_se_opts "--node-down-failure-threshold" "${SE_NODE_DOWN_FAILURE_THRESHOLD}"
+fi
+
 if [ ! -z "$SE_LOG_LEVEL" ]; then
   append_se_opts "--log-level" "${SE_LOG_LEVEL}"
 fi

scripts/generate_list_env_vars/description.yaml

@@ -494,3 +494,20 @@
     a slot in a Node once the Node has been matched. Switch to built-in Greedy strategy,
     use class name `org.openqa.selenium.grid.distributor.selector.GreedySlotSelector`
   cli: --slot-selector
+- name: SE_EVENT_BUS_HEARTBEAT_PERIOD
+  description: How often, in seconds, will the EventBus socket send heartbeats
+  cli: --eventbus-heartbeat-period
+- name: SE_NODE_ENABLE_BROWSER
+  description: Checkout usage of SE_NODE_ENABLE_BROWSER_* in below
+  cli: ''
+- name: SE_NODE_ENABLE_BROWSER_
+  description: 'This is used in node/standalone all browsers in one container, append
+    suffix CHROME, FIREFOX or EDGE to disable correspoding browser in Node stereotypes.
+    For example: SE_NODE_ENABLE_BROWSER_CHROME=false'
+  cli: ''
+- name: SE_NODE_DOWN_FAILURE_THRESHOLD
+  description: Maximum number of consecutive session creation failures before the
+    Node is marked as DOWN. This helps detect and isolate unhealthy Nodes that consistently
+    fail to create sessions. A value of 0 (default) disables this feature, allowing
+    unlimited retries. A value higher than zero enables this feature.
+  cli: --node-down-failure-threshold

scripts/generate_list_env_vars/value.yaml

@@ -28,6 +28,8 @@
   default: 'false'
 - name: SE_ENABLE_TRACING
   default: 'true'
+- name: SE_EVENT_BUS_HEARTBEAT_PERIOD
+  default: ''
 - name: SE_EVENT_BUS_HOST
   default: ''
 - name: SE_EVENT_BUS_PORT
@@ -92,18 +94,22 @@
   default: 'true'
 - name: SE_NODE_DOCKER_CONFIG_FILENAME
   default: docker.toml
+- name: SE_NODE_DOWN_FAILURE_THRESHOLD
+  default: '0'
+- name: SE_NODE_ENABLE_BROWSER
+  default: ''
+- name: SE_NODE_ENABLE_BROWSER_
+  default: ''
 - name: SE_NODE_ENABLE_CDP
   default: ''
 - name: SE_NODE_ENABLE_MANAGED_DOWNLOADS
   default: 'true'
 - name: SE_NODE_GRACEFUL_SHUTDOWN
   default: ''
-- name: SE_NODE_GRID_GRAPHQL_URL
-  default: ''
 - name: SE_NODE_GRID_URL
   default: ''
 - name: SE_NODE_HEARTBEAT_PERIOD
-  default: '30'
+  default: '15'
 - name: SE_NODE_HOST
   default: ''
 - name: SE_NODE_MAX_SESSIONS