diff --git a/Base/Dockerfile b/Base/Dockerfile index 91a216c6a..fea8b96ad 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -5,8 +5,8 @@ LABEL authors="Selenium " ARG VERSION ARG RELEASE=selenium-${VERSION} # Default value should be aligned with upstream Selenium (https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl) -ARG OPENTELEMETRY_VERSION=1.33.0 -ARG GRPC_VERSION=1.60.1 +ARG OPENTELEMETRY_VERSION=1.34.1 +ARG GRPC_VERSION=1.61.0 #Arguments to define the user running Selenium ARG SEL_USER=seluser @@ -119,7 +119,6 @@ RUN curl -fLo /tmp/cs https://github.com/coursier/launchers/raw/master/coursier RUN /tmp/cs fetch --classpath --cache /external_jars \ io.opentelemetry:opentelemetry-exporter-otlp:${OPENTELEMETRY_VERSION} \ - io.opentelemetry:opentelemetry-exporter-jaeger:${OPENTELEMETRY_VERSION} \ io.grpc:grpc-netty:${GRPC_VERSION} > /external_jars/.classpath.txt RUN chmod 664 /external_jars/.classpath.txt diff --git a/Distributor/start-selenium-grid-distributor.sh b/Distributor/start-selenium-grid-distributor.sh index f8c2c0807..a012ab609 100755 --- a/Distributor/start-selenium-grid-distributor.sh +++ b/Distributor/start-selenium-grid-distributor.sh @@ -108,7 +108,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh index cf9d57388..f033008a2 100755 --- a/EventBus/start-selenium-grid-eventbus.sh +++ b/EventBus/start-selenium-grid-eventbus.sh @@ -63,7 +63,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh index a09569161..8a295e550 100755 --- a/Hub/start-selenium-grid-hub.sh +++ b/Hub/start-selenium-grid-hub.sh @@ -81,7 +81,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh index feb9d92ac..4b90810d2 100755 --- a/NodeBase/start-selenium-node.sh +++ b/NodeBase/start-selenium-node.sh @@ -105,7 +105,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/NodeDocker/start-selenium-grid-docker.sh b/NodeDocker/start-selenium-grid-docker.sh index 1396d0e48..c5e91d597 100755 --- a/NodeDocker/start-selenium-grid-docker.sh +++ b/NodeDocker/start-selenium-grid-docker.sh @@ -73,7 +73,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/README.md b/README.md index a726755bc..33176f70e 100644 --- a/README.md +++ b/README.md @@ -1267,7 +1267,7 @@ 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 -p 4317:4317 --net grid --name jaeger jaegertracing/all-in-one:1.54 +docker run -d -p 16686:16686 -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" \ diff --git a/Router/start-selenium-grid-router.sh b/Router/start-selenium-grid-router.sh index d1ef46666..fa1946f77 100755 --- a/Router/start-selenium-grid-router.sh +++ b/Router/start-selenium-grid-router.sh @@ -108,7 +108,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/SessionQueue/start-selenium-grid-session-queue.sh b/SessionQueue/start-selenium-grid-session-queue.sh index db6467df4..c02cd066e 100755 --- a/SessionQueue/start-selenium-grid-session-queue.sh +++ b/SessionQueue/start-selenium-grid-session-queue.sh @@ -68,7 +68,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/Sessions/start-selenium-grid-sessions.sh b/Sessions/start-selenium-grid-sessions.sh index ead0b9816..f0f519d7d 100755 --- a/Sessions/start-selenium-grid-sessions.sh +++ b/Sessions/start-selenium-grid-sessions.sh @@ -78,7 +78,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh index c7e0b97e1..25bc14ca7 100755 --- a/Standalone/start-selenium-standalone.sh +++ b/Standalone/start-selenium-standalone.sh @@ -81,7 +81,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh index 43780ad76..1d2f59a30 100755 --- a/StandaloneDocker/start-selenium-grid-docker.sh +++ b/StandaloneDocker/start-selenium-grid-docker.sh @@ -58,7 +58,7 @@ if [ "$SE_ENABLE_TRACING" = "true" ]; 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}" + SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.exporter.otlp.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}" diff --git a/charts/selenium-grid/README.md b/charts/selenium-grid/README.md index 13c126db8..29691e931 100644 --- a/charts/selenium-grid/README.md +++ b/charts/selenium-grid/README.md @@ -637,8 +637,8 @@ In case you want to use your own existing Jaeger instance, you can set the follo ```yaml tracing: enabledWithExistingEndpoint: true - exporter: otlp #or jaeger - exporterEndpoint: 'http://jaeger.domain.com:4317' #or 'http://jaeger.domain.com:14250' + exporter: otlp + exporterEndpoint: 'http://jaeger.domain.com:4317' ``` ### Configuration of Selenium Grid chart diff --git a/docker-compose-v2-tracing.yml b/docker-compose-v2-tracing.yml index 342c4f380..b59724ffe 100644 --- a/docker-compose-v2-tracing.yml +++ b/docker-compose-v2-tracing.yml @@ -7,7 +7,7 @@ services: image: jaegertracing/all-in-one:1.54 ports: - "16686:16686" - - "14250:14250" + - "4317:4317" chrome: image: selenium/node-chrome:4.17.0-20240123 shm_size: 2gb @@ -18,8 +18,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 ports: - "6900:5900" @@ -33,8 +33,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 ports: - "6901:5900" @@ -48,8 +48,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 ports: - "6902:5900" @@ -63,5 +63,5 @@ services: - jaeger environment: - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 diff --git a/docker-compose-v3-full-grid-tracing.yml b/docker-compose-v3-full-grid-tracing.yml index 539842a6f..f2d454619 100644 --- a/docker-compose-v3-full-grid-tracing.yml +++ b/docker-compose-v3-full-grid-tracing.yml @@ -7,7 +7,6 @@ services: image: jaegertracing/all-in-one:1.54 ports: - "16686:16686" - - "14250:14250" - "4317:4317" selenium-event-bus: image: selenium/event-bus:4.17.0-20240123 @@ -20,8 +19,8 @@ services: - jaeger environment: - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 selenium-sessions: image: selenium/sessions:4.17.0-20240123 container_name: selenium-sessions @@ -34,8 +33,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 selenium-session-queue: image: selenium/session-queue:4.17.0-20240123 container_name: selenium-session-queue @@ -43,8 +42,8 @@ services: - "5559:5559" environment: - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 selenium-distributor: image: selenium/distributor:4.17.0-20240123 container_name: selenium-distributor @@ -63,8 +62,8 @@ services: - SE_SESSION_QUEUE_HOST=selenium-session-queue - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 selenium-router: image: selenium/router:4.17.0-20240123 container_name: selenium-router @@ -82,8 +81,8 @@ services: - SE_SESSION_QUEUE_HOST=selenium-session-queue - SE_SESSION_QUEUE_PORT=5559 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 chrome: image: selenium/node-chrome:4.17.0-20240123 shm_size: 2gb @@ -94,8 +93,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 edge: image: selenium/node-edge:4.17.0-20240123 shm_size: 2gb @@ -106,8 +105,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 firefox: image: selenium/node-firefox:4.17.0-20240123 shm_size: 2gb @@ -118,5 +117,5 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 diff --git a/docker-compose-v3-tracing.yml b/docker-compose-v3-tracing.yml index 5bb676504..6dfb9931f 100644 --- a/docker-compose-v3-tracing.yml +++ b/docker-compose-v3-tracing.yml @@ -7,7 +7,6 @@ services: image: jaegertracing/all-in-one:1.54 ports: - "16686:16686" - - "14250:14250" - "4317:4317" chrome: image: selenium/node-chrome:4.17.0-20240123 @@ -19,8 +18,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 edge: image: selenium/node-edge:4.17.0-20240123 @@ -32,8 +31,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 firefox: image: selenium/node-firefox:4.17.0-20240123 @@ -45,8 +44,8 @@ services: - SE_EVENT_BUS_PUBLISH_PORT=4442 - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 selenium-hub: image: selenium/hub:4.17.0-20240123 @@ -59,5 +58,5 @@ services: - jaeger environment: - SE_ENABLE_TRACING=true - - SE_OTEL_TRACES_EXPORTER=otlp #or jaeger - - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317 #or http://jaeger:14250 + - SE_OTEL_TRACES_EXPORTER=otlp + - SE_OTEL_EXPORTER_ENDPOINT=http://jaeger:4317