Skip to content

Commit 02ea1a7

Browse files
VietND96VietND96
authored
Docker: Update condition to enable tracing to avoid annoying warning messages (#2541)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 3644fb0 commit 02ea1a7

35 files changed

+10
-140
lines changed

‎Distributor/start-selenium-grid-distributor.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fi
151151

152152
EXTRA_LIBS=""
153153

154-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
154+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
155155
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
156156
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
157157
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎EventBus/start-selenium-grid-eventbus.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fi
8181

8282
EXTRA_LIBS=""
8383

84-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
84+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
8585
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
8686
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
8787
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎Hub/start-selenium-grid-hub.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ fi
131131

132132
EXTRA_LIBS=""
133133

134-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
134+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
135135
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
136136
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
137137
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎NodeBase/start-selenium-node.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fi
127127

128128
EXTRA_LIBS=""
129129

130-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
130+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
131131
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
132132
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
133133
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎NodeDocker/start-selenium-grid-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fi
9191

9292
EXTRA_LIBS=""
9393

94-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
94+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
9595
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
9696
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
9797
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎Router/start-selenium-grid-router.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fi
132132

133133
EXTRA_LIBS=""
134134

135-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
135+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
136136
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
137137
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
138138
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎SessionQueue/start-selenium-grid-session-queue.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ fi
8585

8686
EXTRA_LIBS=""
8787

88-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
88+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
8989
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
9090
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
9191
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎Sessions/start-selenium-grid-sessions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fi
107107

108108
EXTRA_LIBS=""
109109

110-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
110+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
111111
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
112112
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
113113
EXTRA_LIBS="${EXTRA_LIBS}${EXTERNAL_JARS}"

‎Standalone/start-selenium-standalone.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ echo "Starting Selenium Grid Standalone..."
130130

131131
EXTRA_LIBS=""
132132

133-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
133+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
134134
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
135135
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
136136
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

‎StandaloneDocker/start-selenium-grid-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fi
9696

9797
EXTRA_LIBS=""
9898

99-
if [ "$SE_ENABLE_TRACING" = "true" ]; then
99+
if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ]; then
100100
EXTERNAL_JARS=$(</external_jars/.classpath.txt)
101101
[ -n "$EXTRA_LIBS" ] && [ -n "${EXTERNAL_JARS}" ] && EXTRA_LIBS=${EXTRA_LIBS}:
102102
EXTRA_LIBS="--ext "${EXTRA_LIBS}${EXTERNAL_JARS}

0 commit comments

Comments
 (0)