feat: enable tracing observability in docker-compose and helm chart (#…

…2137) Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
SeleniumHQ · Feb 18, 2024 · cd10250 · cd10250
1 parent b3bf338
commit cd10250
Show file tree

Hide file tree

Showing 48 changed files with 406 additions and 60 deletions.
diff --git a/Base/Dockerfile b/Base/Dockerfile
@@ -140,6 +140,9 @@ ENV SE_BIND_HOST false
 # Boolean value, maps "--reject-unsupported-caps"
 ENV SE_REJECT_UNSUPPORTED_CAPS false
 
+ENV SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED true
+ENV SE_OTEL_TRACES_EXPORTER "otlp"
+
 # A too high maximum number of file descriptors (with the default value
 # inherited from the docker host) can cause issues with some of our tools:
 #  - sanitizers hanging: https://github.com/google/sanitizers/issues/1662

diff --git a/Distributor/Dockerfile b/Distributor/Dockerfile
@@ -21,3 +21,5 @@ COPY selenium-grid-distributor.conf /etc/supervisor/conf.d/
 ENV SE_SESSION_REQUEST_TIMEOUT 300
 # In seconds, maps to "--session-retry-interval"
 ENV SE_SESSION_RETRY_INTERVAL 15
+
+ENV SE_OTEL_SERVICE_NAME "selenium-distributor"
diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh
@@ -95,12 +95,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/EventBus/Dockerfile b/EventBus/Dockerfile
@@ -21,3 +21,5 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-eventbus.sh \
     /opt/bin/
 
 COPY selenium-grid-eventbus.conf /etc/supervisor/conf.d/
+
+ENV SE_OTEL_SERVICE_NAME "selenium-event-bus"
diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
@@ -50,12 +50,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/Hub/Dockerfile b/Hub/Dockerfile
@@ -25,3 +25,5 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-hub.sh \
     /opt/bin/
 
 COPY selenium-grid-hub.conf /etc/supervisor/conf.d/
+
+ENV SE_OTEL_SERVICE_NAME "selenium-hub"
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
@@ -68,12 +68,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/Makefile b/Makefile
@@ -450,11 +450,11 @@ chart_test_autoscaling_deployment_https:
 	SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 make chart_test_autoscaling_deployment
 
 chart_test_autoscaling_deployment:
-	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
+	SE_ENABLE_TRACING=true VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \
 	./tests/charts/make/chart_test.sh DeploymentAutoscaling
 
 chart_test_autoscaling_job_https:
-	SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 make chart_test_autoscaling_job
+	SE_ENABLE_TRACING=true SELENIUM_GRID_TEST_HEADLESS=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_PORT=443 make chart_test_autoscaling_job
 
 chart_test_autoscaling_job:
 	VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) NAMESPACE=$(NAMESPACE) \

diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile
@@ -198,6 +198,7 @@ ENV SE_NODE_OVERRIDE_MAX_SESSIONS false
 
 # Following line fixes https://github.com/SeleniumHQ/docker-selenium/issues/87
 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
+ENV SE_OTEL_SERVICE_NAME "selenium-node"
 
 # Copying configuration script generator
 COPY --chown="${SEL_UID}:${SEL_GID}" generate_config /opt/bin/generate_config

diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh
@@ -92,12 +92,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/NodeChrome/Dockerfile b/NodeChrome/Dockerfile
@@ -61,3 +61,5 @@ USER ${SEL_UID}
 RUN echo "chrome" > /opt/selenium/browser_name
 RUN google-chrome --version | awk '{print $3}' > /opt/selenium/browser_version
 RUN echo "\"goog:chromeOptions\": {\"binary\": \"/usr/bin/google-chrome\"}" > /opt/selenium/browser_binary_location
+
+ENV SE_OTEL_SERVICE_NAME "selenium-node-chrome"
diff --git a/NodeDocker/Dockerfile b/NodeDocker/Dockerfile
@@ -28,3 +28,4 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-docker.sh \
 
 COPY selenium-grid-docker.conf /etc/supervisor/conf.d/
 
+ENV SE_OTEL_SERVICE_NAME "selenium-node-docker"
diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh
@@ -60,12 +60,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/NodeEdge/Dockerfile b/NodeEdge/Dockerfile
@@ -54,3 +54,5 @@ USER ${SEL_UID}
 RUN echo "MicrosoftEdge" > /opt/selenium/browser_name
 RUN microsoft-edge --version | awk '{print $3}' > /opt/selenium/browser_version
 RUN echo "\"ms:edgeOptions\": {\"binary\": \"/usr/bin/microsoft-edge\"}" > /opt/selenium/browser_binary_location
+
+ENV SE_OTEL_SERVICE_NAME "selenium-node-edge"
diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile
@@ -44,3 +44,5 @@ USER ${SEL_UID}
 RUN echo "firefox" > /opt/selenium/browser_name
 RUN firefox --version | awk '{print $3}' > /opt/selenium/browser_version
 RUN echo "\"moz:firefoxOptions\": {\"binary\": \"/usr/bin/firefox\"}" > /opt/selenium/browser_binary_location
+
+ENV SE_OTEL_SERVICE_NAME "selenium-node-firefox"
diff --git a/README.md b/README.md
@@ -1267,26 +1267,29 @@ In order to enable tracing in the Selenium Grid container, the following command
 
 ```bash
 docker network create grid
-docker run -d -p 16686:16686 -p 14250:14250 --net grid --name jaeger jaegertracing/all-in-one:1.17
+docker run -d -p 16686:16686 -p 14250:14250 -p 4317:4317 --net grid --name jaeger jaegertracing/all-in-one:1.54
 docker run -d -p 4442-4444:4442-4444 --net grid --name selenium-hub selenium/hub:4.17.0-20240123
 docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
     --shm-size="2g" \
 	-e SE_ENABLE_TRACING=true \
-	-e JAVA_OPTS="-Dotel.traces.exporter=jaeger -Dotel.exporter.jaeger.endpoint=http://jaegar:14250 -Dotel.resource.attributes=service.name=selenium-node-chrome" \
+	-e SE_OTEL_TRACES_EXPORTER=otlp \
+	-e SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 \
     -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
     -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
     selenium/node-chrome:4.17.0-20240123
 docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
     --shm-size="2g" \
 	-e SE_ENABLE_TRACING=true \
-	-e JAVA_OPTS="-Dotel.traces.exporter=jaeger -Dotel.exporter.jaeger.endpoint=http://jaegar:14250 -Dotel.resource.attributes=service.name=selenium-node-edge" \
+	-e SE_OTEL_TRACES_EXPORTER=otlp \
+	-e SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 \
     -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
     -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
     selenium/node-edge:4.17.0-20240123
 docker run -d --net grid -e SE_EVENT_BUS_HOST=selenium-hub \
     --shm-size="2g" \
 	-e SE_ENABLE_TRACING=true \
-	-e JAVA_OPTS="-Dotel.traces.exporter=jaeger -Dotel.exporter.jaeger.endpoint=http://jaegar:14250 -Dotel.resource.attributes=service.name=selenium-node-firefox" \
+	-e SE_OTEL_TRACES_EXPORTER=otlp \
+	-e SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 \
     -e SE_EVENT_BUS_PUBLISH_PORT=4442 \
     -e SE_EVENT_BUS_SUBSCRIBE_PORT=4443 \
     selenium/node-firefox:4.17.0-20240123
@@ -1298,7 +1301,7 @@ You can also refer to the below docker-compose yaml files to be able to start a
 * Simple Grid [v2 yaml file](docker-compose-v2-tracing.yml)
 * Dynamic Grid [v3 yaml file](docker-compose-v3-full-grid-tracing.yml)
 
-You can view the [Jaegar UI](http://localhost:16686/) and trace your request.
+You can view the [Jaeger UI](http://localhost:16686/) and trace your request.
 ___
 
 ## Troubleshooting

diff --git a/Router/Dockerfile b/Router/Dockerfile
@@ -21,3 +21,5 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-router.sh \
     /opt/bin/
 
 COPY selenium-grid-router.conf /etc/supervisor/conf.d/
+
+ENV SE_OTEL_SERVICE_NAME "selenium-router"
diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh
@@ -95,12 +95,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/SessionQueue/Dockerfile b/SessionQueue/Dockerfile
@@ -21,3 +21,5 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-session-queue.sh \
     /opt/bin/
 
 COPY selenium-grid-session-queue.conf /etc/supervisor/conf.d/
+
+ENV SE_OTEL_SERVICE_NAME "selenium-session-queue"
diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh
@@ -55,12 +55,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/Sessions/Dockerfile b/Sessions/Dockerfile
@@ -16,3 +16,5 @@ COPY --chown="${SEL_UID}:${SEL_GID}" start-selenium-grid-sessions.sh \
     /opt/bin/
 
 COPY selenium-grid-sessions.conf /etc/supervisor/conf.d/
+
+ENV SE_OTEL_SERVICE_NAME "selenium-session-map"
diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh
@@ -65,12 +65,28 @@ fi
 
 EXTRA_LIBS=""
 
-if [ ! -z "$SE_ENABLE_TRACING" ]; then
+if [ "$SE_ENABLE_TRACING" = "true" ]; then
   EXTERNAL_JARS=$(</external_jars/.classpath.txt)
   [ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
   EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}
   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
+  if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"
+  fi
+  if [ -n "$SE_OTEL_EXPORTER_ENDPOINT" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.${SE_OTEL_TRACES_EXPORTER,,}.endpoint=${SE_OTEL_EXPORTER_ENDPOINT}"
+  fi
+  if [ -n "$SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED" ]; then
+    SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
+  fi
+  if [ -n "$SE_OTEL_JVM_ARGS" ]; then
+    echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
+    SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
+  fi
 else
   echo "Tracing is disabled"
 fi

diff --git a/Standalone/Dockerfile b/Standalone/Dockerfile
@@ -29,4 +29,4 @@ ENV SE_RELAX_CHECKS true
 
 EXPOSE 4444
 
-
+ENV SE_OTEL_SERVICE_NAME "selenium-standalone"