Skip to content

Docker: Update condition to enable tracing to avoid annoying warning messages #2541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2024
Merged

Docker: Update condition to enable tracing to avoid annoying warning messages #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Distributor/start-selenium-grid-distributor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=$(</external_jars/.classpath.txt)
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
Expand Down
2 changes: 1 addition & 1 deletion EventBus/start-selenium-grid-eventbus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion Hub/start-selenium-grid-hub.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion NodeBase/start-selenium-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion NodeDocker/start-selenium-grid-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion Router/start-selenium-grid-router.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion SessionQueue/start-selenium-grid-session-queue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion Sessions/start-selenium-grid-sessions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}"
Expand Down
2 changes: 1 addition & 1 deletion Standalone/start-selenium-standalone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ echo "Starting Selenium Grid Standalone..."

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
2 changes: 1 addition & 1 deletion StandaloneDocker/start-selenium-grid-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ fi

EXTRA_LIBS=""

if [ "$SE_ENABLE_TRACING" = "true" ]; then
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}
Expand Down
5 changes: 0 additions & 5 deletions docker-compose-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
ports:
- "6900:5900"

Expand All @@ -25,7 +24,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false
ports:
- "6901:5900"

Expand All @@ -38,14 +36,11 @@ services:
- SE_EVENT_BUS_HOST=selenium-hub
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false
ports:
- "6902:5900"

selenium-hub:
image: selenium/hub:4.27.0-20241225
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand Down
5 changes: 0 additions & 5 deletions docker-compose-v3-basicauth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

selenium-hub:
image: selenium/hub:4.27.0-20241225
Expand All @@ -43,7 +40,5 @@ services:
- "4442:4442"
- "4443:4443"
- "4444:4444"
environment:
- SE_ENABLE_TRACING=false
volumes:
- ./Hub/example-config.toml:/opt/selenium/config.toml
5 changes: 0 additions & 5 deletions docker-compose-v3-beta-channel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:beta
Expand All @@ -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:beta
Expand All @@ -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:latest
container_name: selenium-hub
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand Down
5 changes: 0 additions & 5 deletions docker-compose-v3-dev-channel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:dev
Expand All @@ -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:dev
Expand All @@ -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:latest
container_name: selenium-hub
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand Down
5 changes: 0 additions & 5 deletions docker-compose-v3-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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
Expand All @@ -27,7 +26,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
Expand All @@ -40,15 +38,12 @@ 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
volumes:
- ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-v3-dynamic-grid.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,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"
Expand Down
10 changes: 0 additions & 10 deletions docker-compose-v3-full-grid-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ services:
volumes:
- ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar
container_name: selenium-event-bus
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand All @@ -28,15 +26,12 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false

selenium-session-queue:
image: selenium/session-queue:4.27.0-20241225
volumes:
- ./selenium_server_deploy.jar:/opt/selenium/selenium-server.jar
container_name: selenium-session-queue
environment:
- SE_ENABLE_TRACING=false
ports:
- "5559:5559"

Expand All @@ -59,7 +54,6 @@ services:
- SE_SESSIONS_MAP_PORT=5556
- SE_SESSION_QUEUE_HOST=selenium-session-queue
- SE_SESSION_QUEUE_PORT=5559
- SE_ENABLE_TRACING=false

selenium-router:
image: selenium/router:4.27.0-20241225
Expand All @@ -79,7 +73,6 @@ services:
- SE_SESSIONS_MAP_PORT=5556
- SE_SESSION_QUEUE_HOST=selenium-session-queue
- SE_SESSION_QUEUE_PORT=5559
- SE_ENABLE_TRACING=false

chrome:
image: selenium/node-chrome:4.27.0-20241225
Expand All @@ -92,7 +85,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- 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
Expand All @@ -105,7 +97,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- 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
Expand All @@ -118,4 +109,3 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false
10 changes: 0 additions & 10 deletions docker-compose-v3-full-grid-external-datastore.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ services:
selenium-event-bus:
image: selenium/event-bus:4.27.0-20241225
container_name: selenium-event-bus
environment:
- SE_ENABLE_TRACING=false
ports:
- "4442:4442"
- "4443:4443"
Expand All @@ -24,7 +22,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false
- SE_SESSIONS_MAP_EXTERNAL_DATASTORE=true
- SE_SESSIONS_MAP_EXTERNAL_IMPLEMENTATION=org.openqa.selenium.grid.sessionmap.jdbc.JdbcBackedSessionMap
- SE_SESSIONS_MAP_EXTERNAL_JDBC_URL=jdbc:postgresql://postgresql:5432/selenium_sessions
Expand Down Expand Up @@ -57,8 +54,6 @@ services:
selenium-session-queue:
image: selenium/session-queue:4.27.0-20241225
container_name: selenium-session-queue
environment:
- SE_ENABLE_TRACING=false
ports:
- "5559:5559"

Expand All @@ -79,7 +74,6 @@ services:
- SE_SESSIONS_MAP_PORT=5556
- SE_SESSION_QUEUE_HOST=selenium-session-queue
- SE_SESSION_QUEUE_PORT=5559
- SE_ENABLE_TRACING=false

selenium-router:
image: selenium/router:4.27.0-20241225
Expand All @@ -97,7 +91,6 @@ services:
- SE_SESSIONS_MAP_PORT=5556
- SE_SESSION_QUEUE_HOST=selenium-session-queue
- SE_SESSION_QUEUE_PORT=5559
- SE_ENABLE_TRACING=false

chrome:
image: selenium/node-chrome:4.27.0-20241225
Expand All @@ -108,7 +101,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- 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
Expand All @@ -119,7 +111,6 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- 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
Expand All @@ -130,4 +121,3 @@ services:
- SE_EVENT_BUS_HOST=selenium-event-bus
- SE_EVENT_BUS_PUBLISH_PORT=4442
- SE_EVENT_BUS_SUBSCRIBE_PORT=4443
- SE_ENABLE_TRACING=false
Loading
Loading