Skip to content

Commit e31d575

Browse files
VietND96VietND96
committed
Docker: Logs value SE_JAVA_OPTS while starting container
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 6af8daf commit e31d575

File tree

10 files changed

+40
-10
lines changed

10 files changed

+40
-10
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
170170
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
171171
fi
172172
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
173-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
174173
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
175174
fi
176175
else
@@ -187,6 +186,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
187186
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
188187
fi
189188

189+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
190+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
191+
fi
192+
190193
function handle_heap_dump() {
191194
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
192195
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
100100
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
101101
fi
102102
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
103-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
104103
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
105104
fi
106105
else
@@ -117,6 +116,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
117116
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
118117
fi
119118

119+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
120+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
121+
fi
122+
120123
function handle_heap_dump() {
121124
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
122125
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
150150
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
151151
fi
152152
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
153-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
154153
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
155154
fi
156155
else
@@ -167,6 +166,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
167166
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
168167
fi
169168

169+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
170+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
171+
fi
172+
170173
function handle_heap_dump() {
171174
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
172175
}

‎NodeBase/start-selenium-node.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
149149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
150150
fi
151151
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
152-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
153152
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
154153
fi
155154
else
@@ -182,6 +181,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
182181
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
183182
fi
184183

184+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
185+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
186+
fi
187+
185188
function handle_heap_dump() {
186189
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
187190
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
117117
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
118118
fi
119119
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
120-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
121120
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
122121
fi
123122
else
@@ -134,6 +133,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
134133
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
135134
fi
136135

136+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
137+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
138+
fi
139+
137140
function handle_heap_dump() {
138141
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
139142
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
151151
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
152152
fi
153153
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
154-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
155154
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
156155
fi
157156
else
@@ -168,6 +167,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
168167
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
169168
fi
170169

170+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
171+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
172+
fi
173+
171174
function handle_heap_dump() {
172175
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
173176
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
104104
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
105105
fi
106106
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
107-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
108107
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
109108
fi
110109
else
@@ -121,6 +120,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
121120
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
122121
fi
123122

123+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
124+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
125+
fi
126+
124127
function handle_heap_dump() {
125128
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
126129
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
126126
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
127127
fi
128128
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
129-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
130129
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
131130
fi
132131
else
@@ -156,6 +155,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
156155
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
157156
fi
158157

158+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
159+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
160+
fi
161+
159162
function handle_heap_dump() {
160163
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
161164
}

‎Standalone/start-selenium-standalone.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
149149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
150150
fi
151151
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
152-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
153152
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
154153
fi
155154
else
@@ -170,6 +169,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
170169
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
171170
fi
172171

172+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
173+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
174+
fi
175+
173176
function handle_heap_dump() {
174177
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
175178
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
118118
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.java.global-autoconfigure.enabled=${SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED}"
119119
fi
120120
if [ -n "$SE_OTEL_JVM_ARGS" ]; then
121-
echo "List arguments for OpenTelemetry: ${SE_OTEL_JVM_ARGS}"
122121
SE_JAVA_OPTS="$SE_JAVA_OPTS ${SE_OTEL_JVM_ARGS}"
123122
fi
124123
else
@@ -135,6 +134,10 @@ if [ -n "${SE_JAVA_OPTS_DEFAULT}" ]; then
135134
SE_JAVA_OPTS="${SE_JAVA_OPTS_DEFAULT} $SE_JAVA_OPTS"
136135
fi
137136

137+
if [ -n "${JAVA_OPTS:-$SE_JAVA_OPTS}" ]; then
138+
echo "Using JAVA_OPTS: ${JAVA_OPTS:-$SE_JAVA_OPTS}"
139+
fi
140+
138141
function handle_heap_dump() {
139142
/opt/bin/handle_heap_dump.sh $SELENIUM_SERVER_PID /opt/selenium/logs
140143
}

0 commit comments

Comments
 (0)