From 02ea1a7059690a7e622b198e34749cfe734fd897 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Fri, 27 Dec 2024 17:42:19 +0700 Subject: [PATCH] Docker: Update condition to enable tracing to avoid annoying warning messages (#2541) Signed-off-by: Viet Nguyen Duc --- Distributor/start-selenium-grid-distributor.sh | 2 +- EventBus/start-selenium-grid-eventbus.sh | 2 +- Hub/start-selenium-grid-hub.sh | 2 +- NodeBase/start-selenium-node.sh | 2 +- NodeDocker/start-selenium-grid-docker.sh | 2 +- Router/start-selenium-grid-router.sh | 2 +- SessionQueue/start-selenium-grid-session-queue.sh | 2 +- Sessions/start-selenium-grid-sessions.sh | 2 +- Standalone/start-selenium-standalone.sh | 2 +- StandaloneDocker/start-selenium-grid-docker.sh | 2 +- docker-compose-v2.yml | 5 ----- docker-compose-v3-basicauth.yml | 5 ----- docker-compose-v3-beta-channel.yml | 5 ----- docker-compose-v3-dev-channel.yml | 5 ----- docker-compose-v3-dev.yml | 5 ----- docker-compose-v3-dynamic-grid.yml | 3 --- docker-compose-v3-full-grid-dev.yml | 10 ---------- docker-compose-v3-full-grid-external-datastore.yml | 10 ---------- docker-compose-v3-full-grid-nightly.yml | 13 ------------- docker-compose-v3-full-grid-secure.yml | 8 -------- docker-compose-v3-full-grid-swarm.yml | 5 ----- docker-compose-v3-full-grid.yml | 10 ---------- docker-compose-v3-swarm.yml | 5 ----- docker-compose-v3-video-in-node.yml | 5 ----- docker-compose-v3-video-upload-dynamic-grid.yml | 3 --- docker-compose-v3-video-upload-standalone.yml | 3 --- docker-compose-v3-video-upload.yml | 5 ----- docker-compose-v3-video.yml | 5 ----- docker-compose-v3.yml | 5 ----- tests/docker-compose-v3-test-node-docker.yaml | 2 -- tests/docker-compose-v3-test-node-relay.yml | 4 ---- tests/docker-compose-v3-test-parallel.yml | 4 ---- tests/docker-compose-v3-test-standalone-docker.yaml | 1 - tests/docker-compose-v3-test-standalone.yml | 1 - tests/docker-compose-v3-test-video.yml | 3 --- 35 files changed, 10 insertions(+), 140 deletions(-) diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh index 15ba53ed19..d4ff1660e2 100755 --- a/Distributor/start-selenium-grid-distributor.sh +++ b/Distributor/start-selenium-grid-distributor.sh @@ -151,7 +151,7 @@ fi EXTRA_LIBS="" -if [ "$SE_ENABLE_TRACING" = "true" ]; then +if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then EXTERNAL_JARS=$( - SE_RCLONE_CONFIG_MYFTP_PASS=KkK8RsUIba-MMTBUSnuYIdAKvcnFyLl2pdhQig - SE_RCLONE_CONFIG_MYFTP_FTP_CONCURRENCY=10 - - SE_ENABLE_TRACING=false selenium-hub: image: selenium/hub:4.27.0-20241225 container_name: selenium-hub - environment: - - SE_ENABLE_TRACING=false ports: - "4442:4442" - "4443:4443" diff --git a/docker-compose-v3-video-upload-standalone.yml b/docker-compose-v3-video-upload-standalone.yml index 75e5cfc1e4..5323d2e9c1 100644 --- a/docker-compose-v3-video-upload-standalone.yml +++ b/docker-compose-v3-video-upload-standalone.yml @@ -25,7 +25,6 @@ services: - SE_ROUTER_USERNAME=admin - SE_ROUTER_PASSWORD=admin - SE_SUB_PATH=/selenium - - SE_ENABLE_TRACING=false standalone_edge: image: selenium/standalone-edge:4.27.0-20241225 @@ -36,7 +35,6 @@ services: - SE_ROUTER_USERNAME=admin - SE_ROUTER_PASSWORD=admin - SE_SUB_PATH=/selenium - - SE_ENABLE_TRACING=false standalone_firefox: image: selenium/standalone-firefox:4.27.0-20241225 @@ -47,7 +45,6 @@ services: - SE_ROUTER_USERNAME=admin - SE_ROUTER_PASSWORD=admin - SE_SUB_PATH=/selenium - - SE_ENABLE_TRACING=false chrome_video: image: selenium/video:ffmpeg-7.1-20241225 diff --git a/docker-compose-v3-video-upload.yml b/docker-compose-v3-video-upload.yml index 4c1ea1d34a..037945fad8 100644 --- a/docker-compose-v3-video-upload.yml +++ b/docker-compose-v3-video-upload.yml @@ -25,7 +25,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false edge: image: selenium/node-edge:4.27.0-20241225 @@ -36,7 +35,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false firefox: image: selenium/node-firefox:4.27.0-20241225 @@ -47,7 +45,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false chrome_video: image: selenium/video:ffmpeg-7.1-20241225 @@ -112,8 +109,6 @@ services: selenium-hub: image: selenium/hub:4.27.0-20241225 container_name: selenium-hub - environment: - - SE_ENABLE_TRACING=false ports: - "4442:4442" - "4443:4443" diff --git a/docker-compose-v3-video.yml b/docker-compose-v3-video.yml index 1d90f3b3dc..72e968cd08 100644 --- a/docker-compose-v3-video.yml +++ b/docker-compose-v3-video.yml @@ -12,7 +12,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false edge: image: selenium/node-edge:4.27.0-20241225 @@ -23,7 +22,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false firefox: image: selenium/node-firefox:4.27.0-20241225 @@ -34,7 +32,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false chrome_video: image: selenium/video:ffmpeg-7.1-20241225 @@ -75,8 +72,6 @@ services: selenium-hub: image: selenium/hub:4.27.0-20241225 container_name: selenium-hub - environment: - - SE_ENABLE_TRACING=false ports: - "4442:4442" - "4443:4443" diff --git a/docker-compose-v3.yml b/docker-compose-v3.yml index b5f9d81975..dbd371c68e 100644 --- a/docker-compose-v3.yml +++ b/docker-compose-v3.yml @@ -12,7 +12,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false edge: image: selenium/node-edge:4.27.0-20241225 @@ -23,7 +22,6 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false firefox: image: selenium/node-firefox:4.27.0-20241225 @@ -34,13 +32,10 @@ services: - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - - SE_ENABLE_TRACING=false selenium-hub: image: selenium/hub:4.27.0-20241225 container_name: selenium-hub - environment: - - SE_ENABLE_TRACING=false ports: - "4442:4442" - "4443:4443" diff --git a/tests/docker-compose-v3-test-node-docker.yaml b/tests/docker-compose-v3-test-node-docker.yaml index 9c8a0f002d..b0498c2691 100644 --- a/tests/docker-compose-v3-test-node-docker.yaml +++ b/tests/docker-compose-v3-test-node-docker.yaml @@ -17,7 +17,6 @@ services: - selenium-hub - ftp_server environment: - - SE_ENABLE_TRACING=false - SE_NODE_DOCKER_CONFIG_FILENAME=docker.toml - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 @@ -43,7 +42,6 @@ services: user: ${UID} container_name: selenium-hub environment: - - SE_ENABLE_TRACING=false - SE_LOG_LEVEL=${LOG_LEVEL} - SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT} ports: diff --git a/tests/docker-compose-v3-test-node-relay.yml b/tests/docker-compose-v3-test-node-relay.yml index d0c32a0806..0e736a23e3 100644 --- a/tests/docker-compose-v3-test-node-relay.yml +++ b/tests/docker-compose-v3-test-node-relay.yml @@ -8,7 +8,6 @@ services: volumes: - ./videos/relay_config.toml:/opt/selenium/config.toml environment: - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 @@ -19,14 +18,12 @@ services: image: ${NAMESPACE}/standalone-${BROWSER}:${TAG} shm_size: 2gb environment: - - SE_ENABLE_TRACING=false - SE_OPTS=--enable-cdp true - SE_NODE_ENABLE_CDP=true selenium-hub: image: ${NAMESPACE}/hub:${TAG} environment: - - SE_ENABLE_TRACING=false - SE_LOG_LEVEL=${LOG_LEVEL} - SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT} ports: @@ -60,7 +57,6 @@ services: - selenium-hub - emulator environment: - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 diff --git a/tests/docker-compose-v3-test-parallel.yml b/tests/docker-compose-v3-test-parallel.yml index 7ad41168bd..e0bbaccc35 100644 --- a/tests/docker-compose-v3-test-parallel.yml +++ b/tests/docker-compose-v3-test-parallel.yml @@ -19,7 +19,6 @@ services: - ./videos:/videos environment: - SE_NODE_BROWSER_VERSION= - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 @@ -55,7 +54,6 @@ services: - ./videos:/videos environment: - SE_NODE_BROWSER_VERSION= - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 @@ -87,7 +85,6 @@ services: - ./videos/certs:/opt/selenium/secrets environment: - SE_NODE_BROWSER_VERSION= - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 @@ -115,7 +112,6 @@ services: volumes: - ./videos/certs:/opt/selenium/secrets environment: - - SE_ENABLE_TRACING=false - SE_LOG_LEVEL=${LOG_LEVEL} - SE_SESSION_REQUEST_TIMEOUT=${REQUEST_TIMEOUT} - SE_SUPERVISORD_LOG_LEVEL=error diff --git a/tests/docker-compose-v3-test-standalone-docker.yaml b/tests/docker-compose-v3-test-standalone-docker.yaml index aa3ad9c55e..af85eecc25 100644 --- a/tests/docker-compose-v3-test-standalone-docker.yaml +++ b/tests/docker-compose-v3-test-standalone-docker.yaml @@ -9,7 +9,6 @@ services: - ./videos/config.toml:/opt/selenium/config.toml - /var/run/docker.sock:/var/run/docker.sock environment: - - SE_ENABLE_TRACING=false - SE_VNC_NO_PASSWORD=true - SE_START_VNC=true - SE_LOG_LEVEL=${LOG_LEVEL} diff --git a/tests/docker-compose-v3-test-standalone.yml b/tests/docker-compose-v3-test-standalone.yml index f61c120b49..b83df82013 100644 --- a/tests/docker-compose-v3-test-standalone.yml +++ b/tests/docker-compose-v3-test-standalone.yml @@ -13,7 +13,6 @@ services: - browser_video environment: - SE_NODE_BROWSER_VERSION= - - SE_ENABLE_TRACING=false - SE_NODE_MAX_SESSIONS=1 - SE_NODE_OVERRIDE_MAX_SESSIONS=true - SE_NODE_ENABLE_MANAGED_DOWNLOADS=${SELENIUM_ENABLE_MANAGED_DOWNLOADS} diff --git a/tests/docker-compose-v3-test-video.yml b/tests/docker-compose-v3-test-video.yml index 9281b87b4e..1d625767db 100644 --- a/tests/docker-compose-v3-test-video.yml +++ b/tests/docker-compose-v3-test-video.yml @@ -11,7 +11,6 @@ services: - selenium-hub - browser_video environment: - - SE_ENABLE_TRACING=false - SE_EVENT_BUS_HOST=selenium-hub - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 @@ -60,8 +59,6 @@ services: - "4442:4442" - "4443:4443" - "4444:4444" - environment: - - SE_ENABLE_TRACING=false healthcheck: test: "/opt/bin/check-grid.sh --host 0.0.0.0 --port 4444" interval: 15s