From fd9ea173349d49bb392862efacbb129024106044 Mon Sep 17 00:00:00 2001
From: Trigtrig <7973740+Trigtrig@users.noreply.github.com>
Date: Fri, 21 Mar 2025 14:22:51 +0100
Subject: [PATCH 1/4] feat: allow adding custom external jars to classpath

---
 ENV_VARIABLES.md                |  1 +
 NodeBase/start-selenium-node.sh | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ENV_VARIABLES.md b/ENV_VARIABLES.md
index ba973fde63..7d08267a13 100644
--- a/ENV_VARIABLES.md
+++ b/ENV_VARIABLES.md
@@ -144,3 +144,4 @@
 | SE_NODE_REGISTER_SHUTDOWN_ON_FAILURE | true | If this flag is enabled, the Node will shut down after the register period is completed. This is useful for container environments to restart and register again. If restarted multiple times, the Node container status will be CrashLoopBackOff | --register-shutdown-on-failure |
 | SE_NODE_RELAY_BROWSER_VERSION |  |  |  |
 | SE_NODE_RELAY_ONLY | true |  |  |
+| SE_EXTRA_LIBS | | Extra jars to add to the classpath | --ext |
diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh
index 2b003e386f..94b4364fc7 100755
--- a/NodeBase/start-selenium-node.sh
+++ b/NodeBase/start-selenium-node.sh
@@ -129,13 +129,21 @@ if [ "$GENERATE_CONFIG" = true ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi

From 561db3d17b828995998c18455b2998b16fdf5a57 Mon Sep 17 00:00:00 2001
From: Trigtrig <7973740+Trigtrig@users.noreply.github.com>
Date: Mon, 7 Apr 2025 11:35:01 +0200
Subject: [PATCH 2/4] feat: allow adding custom external jars to classpath

---
 Distributor/start-selenium-grid-distributor.sh    | 14 +++++++++++---
 EventBus/start-selenium-grid-eventbus.sh          | 14 +++++++++++---
 Hub/start-selenium-grid-hub.sh                    | 14 +++++++++++---
 NodeDocker/start-selenium-grid-docker.sh          | 14 +++++++++++---
 Router/start-selenium-grid-router.sh              | 14 +++++++++++---
 SessionQueue/start-selenium-grid-session-queue.sh | 14 +++++++++++---
 Sessions/start-selenium-grid-sessions.sh          | 14 +++++++++++---
 Standalone/start-selenium-standalone.sh           | 14 +++++++++++---
 StandaloneDocker/start-selenium-grid-docker.sh    | 14 +++++++++++---
 9 files changed, 99 insertions(+), 27 deletions(-)

diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index 278e92bcbe..9dc87c1997 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -150,13 +150,21 @@ if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index 205f4751d2..e33d47b520 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -80,13 +80,21 @@ if [ "${SE_ENABLE_TLS}" = "true" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 6f5fd62d93..7cbec29497 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -130,13 +130,21 @@ if [ ! -z "${CONFIG_FILE}" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh
index 197e486549..1fab03e0c4 100755
--- a/NodeDocker/start-selenium-grid-docker.sh
+++ b/NodeDocker/start-selenium-grid-docker.sh
@@ -97,13 +97,21 @@ echo "Selenium Grid Node Docker configuration: "
 cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
index 2f1a25c20f..943bc16e2d 100755
--- a/Router/start-selenium-grid-router.sh
+++ b/Router/start-selenium-grid-router.sh
@@ -131,13 +131,21 @@ if [ ! -z "$SE_ROUTER_PASSWORD" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh
index b336ee2a7e..87cb4f29cc 100755
--- a/SessionQueue/start-selenium-grid-session-queue.sh
+++ b/SessionQueue/start-selenium-grid-session-queue.sh
@@ -84,13 +84,21 @@ if [ ! -z "$SE_REGISTRATION_SECRET" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
index 0d3daae0e7..2d2c229351 100755
--- a/Sessions/start-selenium-grid-sessions.sh
+++ b/Sessions/start-selenium-grid-sessions.sh
@@ -106,13 +106,21 @@ if [ ! -z "${CONFIG_FILE}" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="${EXTRA_LIBS}${EXTERNAL_JARS}"
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
index 9bfa9415b5..2b5573cc5c 100755
--- a/Standalone/start-selenium-standalone.sh
+++ b/Standalone/start-selenium-standalone.sh
@@ -129,13 +129,21 @@ cat "${CONFIG_FILE}"
 echo "Starting Selenium Grid Standalone..."
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh
index 83942fbe62..8699970463 100755
--- a/StandaloneDocker/start-selenium-grid-docker.sh
+++ b/StandaloneDocker/start-selenium-grid-docker.sh
@@ -102,13 +102,21 @@ echo "Selenium Grid Standalone Docker configuration: "
 cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi

From adafa1b6c3c4463e4669e9425e255a7cb4c45d5a Mon Sep 17 00:00:00 2001
From: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
Date: Mon, 7 Apr 2025 16:41:53 +0700
Subject: [PATCH 3/4] Apply for all components

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
---
 .../start-selenium-grid-distributor.sh        | 11 ++++++++--
 EventBus/start-selenium-grid-eventbus.sh      | 11 ++++++++--
 Hub/start-selenium-grid-hub.sh                | 11 ++++++++--
 NodeDocker/start-selenium-grid-docker.sh      | 11 ++++++++--
 Router/start-selenium-grid-router.sh          | 11 ++++++++--
 .../start-selenium-grid-session-queue.sh      | 11 ++++++++--
 Sessions/start-selenium-grid-sessions.sh      | 22 ++++++++++++-------
 Standalone/start-selenium-standalone.sh       | 11 ++++++++--
 .../start-selenium-grid-docker.sh             | 11 ++++++++--
 9 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index 278e92bcbe..76f91af3b1 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -150,11 +150,18 @@ if [ ! -z "$SE_NEW_SESSION_THREAD_POOL_SIZE" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index 205f4751d2..3bd5a7e18c 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -80,11 +80,18 @@ if [ "${SE_ENABLE_TLS}" = "true" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 6f5fd62d93..18154fb76c 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -130,11 +130,18 @@ if [ ! -z "${CONFIG_FILE}" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh
index 197e486549..8424fece87 100755
--- a/NodeDocker/start-selenium-grid-docker.sh
+++ b/NodeDocker/start-selenium-grid-docker.sh
@@ -97,11 +97,18 @@ echo "Selenium Grid Node Docker configuration: "
 cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
index 2f1a25c20f..58f2093662 100755
--- a/Router/start-selenium-grid-router.sh
+++ b/Router/start-selenium-grid-router.sh
@@ -131,11 +131,18 @@ if [ ! -z "$SE_ROUTER_PASSWORD" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh
index b336ee2a7e..5e7a912a12 100755
--- a/SessionQueue/start-selenium-grid-session-queue.sh
+++ b/SessionQueue/start-selenium-grid-session-queue.sh
@@ -84,11 +84,18 @@ if [ ! -z "$SE_REGISTRATION_SECRET" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
index 0d3daae0e7..a7a2250e10 100755
--- a/Sessions/start-selenium-grid-sessions.sh
+++ b/Sessions/start-selenium-grid-sessions.sh
@@ -106,11 +106,18 @@ if [ ! -z "${CONFIG_FILE}" ]; then
 fi
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="${EXTRA_LIBS}${EXTERNAL_JARS}"
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
@@ -136,12 +143,11 @@ fi
 
 if [ "${SE_SESSIONS_MAP_EXTERNAL_DATASTORE}" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath_session_map.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="${EXTRA_LIBS}${EXTERNAL_JARS}"
-fi
-
-if [ -n "${EXTRA_LIBS}" ]; then
-  EXTRA_LIBS="--ext ${EXTRA_LIBS}"
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
 fi
 
 cat "$CONFIG_FILE"
diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
index 9bfa9415b5..e79a5c908e 100755
--- a/Standalone/start-selenium-standalone.sh
+++ b/Standalone/start-selenium-standalone.sh
@@ -129,11 +129,18 @@ cat "${CONFIG_FILE}"
 echo "Starting Selenium Grid Standalone..."
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh
index 83942fbe62..78f04b7385 100755
--- a/StandaloneDocker/start-selenium-grid-docker.sh
+++ b/StandaloneDocker/start-selenium-grid-docker.sh
@@ -102,11 +102,18 @@ echo "Selenium Grid Standalone Docker configuration: "
 cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
+if [ -n "${SE_EXTRA_LIBS}" ]; then
+  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
+  EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
+fi
 
 if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
-  [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
-  EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
+  if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
+  elif [ -z "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
+    EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
+  fi
   echo "Tracing is enabled"
   echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then

From 6a19a9d839dc3eacd5869644eb95662680023de1 Mon Sep 17 00:00:00 2001
From: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
Date: Mon, 7 Apr 2025 16:55:11 +0700
Subject: [PATCH 4/4] Print all info at last

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
---
 Distributor/start-selenium-grid-distributor.sh    | 7 ++++---
 EventBus/start-selenium-grid-eventbus.sh          | 7 ++++---
 Hub/start-selenium-grid-hub.sh                    | 7 ++++---
 NodeBase/start-selenium-node.sh                   | 7 ++++---
 NodeDocker/start-selenium-grid-docker.sh          | 7 ++++---
 Router/start-selenium-grid-router.sh              | 7 ++++---
 SessionQueue/start-selenium-grid-session-queue.sh | 7 ++++---
 Sessions/start-selenium-grid-sessions.sh          | 8 +++++---
 Standalone/start-selenium-standalone.sh           | 7 ++++---
 StandaloneDocker/start-selenium-grid-docker.sh    | 7 ++++---
 10 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
index 9dc87c1997..923e8cb97d 100755
--- a/Distributor/start-selenium-grid-distributor.sh
+++ b/Distributor/start-selenium-grid-distributor.sh
@@ -151,7 +151,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -163,8 +162,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -186,6 +183,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index e33d47b520..83b519da28 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -81,7 +81,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -93,8 +92,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -116,6 +113,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 7cbec29497..0203b50f0a 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -131,7 +131,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -143,8 +142,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -166,6 +163,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh
index 94b4364fc7..7a01c076bf 100755
--- a/NodeBase/start-selenium-node.sh
+++ b/NodeBase/start-selenium-node.sh
@@ -130,7 +130,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -142,8 +141,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -165,6 +162,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ ! -z "${SE_BIND_HOST}" ]; then
   append_se_opts "--bind-host" "${SE_BIND_HOST}"
 fi
diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh
index 1fab03e0c4..c0f6ee96ed 100755
--- a/NodeDocker/start-selenium-grid-docker.sh
+++ b/NodeDocker/start-selenium-grid-docker.sh
@@ -98,7 +98,6 @@ cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -110,8 +109,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -133,6 +130,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
index 943bc16e2d..4fa85941e3 100755
--- a/Router/start-selenium-grid-router.sh
+++ b/Router/start-selenium-grid-router.sh
@@ -132,7 +132,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -144,8 +143,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -167,6 +164,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh
index 87cb4f29cc..e774b4f4ac 100755
--- a/SessionQueue/start-selenium-grid-session-queue.sh
+++ b/SessionQueue/start-selenium-grid-session-queue.sh
@@ -85,7 +85,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -97,8 +96,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -120,6 +117,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
index 5a654e031c..0c494a902b 100755
--- a/Sessions/start-selenium-grid-sessions.sh
+++ b/Sessions/start-selenium-grid-sessions.sh
@@ -107,7 +107,6 @@ fi
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -119,8 +118,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -143,6 +140,7 @@ else
 fi
 
 if [ "${SE_SESSIONS_MAP_EXTERNAL_DATASTORE}" = "true" ]; then
+  echo "External datastore for sessions map is enabled"
   EXTERNAL_JARS=$(</external_jars/.classpath_session_map.txt)
   if [ -n "${EXTRA_LIBS}" ] && [ -n "${EXTERNAL_JARS}" ]; then
     EXTRA_LIBS="${EXTRA_LIBS}:${EXTERNAL_JARS}"
@@ -151,6 +149,10 @@ if [ "${SE_SESSIONS_MAP_EXTERNAL_DATASTORE}" = "true" ]; then
   fi
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 cat "$CONFIG_FILE"
 echo "Starting Selenium Grid Sessions..."
 
diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
index 2b5573cc5c..e9cb86d99c 100755
--- a/Standalone/start-selenium-standalone.sh
+++ b/Standalone/start-selenium-standalone.sh
@@ -130,7 +130,6 @@ echo "Starting Selenium Grid Standalone..."
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -142,8 +141,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -165,6 +162,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 CHROME_DRIVER_PATH_PROPERTY=-Dwebdriver.chrome.driver=/usr/bin/chromedriver
 EDGE_DRIVER_PATH_PROPERTY=-Dwebdriver.edge.driver=/usr/bin/msedgedriver
 GECKO_DRIVER_PATH_PROPERTY=-Dwebdriver.gecko.driver=/usr/bin/geckodriver
diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh
index 8699970463..ff5fc152d7 100755
--- a/StandaloneDocker/start-selenium-grid-docker.sh
+++ b/StandaloneDocker/start-selenium-grid-docker.sh
@@ -103,7 +103,6 @@ cat "${CONFIG_FILE}"
 
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
-  echo "Adding external jars to classpath: ${SE_EXTRA_LIBS}"
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
 fi
 
@@ -115,8 +114,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
     EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
   fi
   echo "Tracing is enabled"
-  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
-
   if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
     SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
   fi
@@ -138,6 +135,10 @@ else
   echo "Tracing is disabled"
 fi
 
+if [ -n "${EXTRA_LIBS}" ]; then
+  echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
+fi
+
 if [ -n "${SE_JAVA_HTTPCLIENT_VERSION}" ]; then
   SE_JAVA_OPTS="$SE_JAVA_OPTS -Dwebdriver.httpclient.version=${SE_JAVA_HTTPCLIENT_VERSION}"
 fi