Skip to content

Commit 7f256fd

Browse files
committed
Merge branch 'extra-libs' of https://github.com/Trigtrig/docker-selenium into extra-libs
2 parents adafa1b + 2e2a98c commit 7f256fd

File tree

9 files changed

+18
-9
lines changed

9 files changed

+18
-9
lines changed

Distributor/start-selenium-grid-distributor.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
163163
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
164164
fi
165165
echo "Tracing is enabled"
166-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
166+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
167+
167168
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
168169
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
169170
fi

EventBus/start-selenium-grid-eventbus.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9393
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
9494
fi
9595
echo "Tracing is enabled"
96-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
96+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
97+
9798
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
9899
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
99100
fi

Hub/start-selenium-grid-hub.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
143143
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
144144
fi
145145
echo "Tracing is enabled"
146-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
146+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
147+
147148
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
148149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
149150
fi

NodeDocker/start-selenium-grid-docker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
110110
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
111111
fi
112112
echo "Tracing is enabled"
113-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
113+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
114+
114115
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
115116
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
116117
fi

Router/start-selenium-grid-router.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
144144
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
145145
fi
146146
echo "Tracing is enabled"
147-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
147+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
148+
148149
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
149150
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
150151
fi

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9797
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
9898
fi
9999
echo "Tracing is enabled"
100-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
100+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
101+
101102
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
102103
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
103104
fi

Sessions/start-selenium-grid-sessions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
119119
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
120120
fi
121121
echo "Tracing is enabled"
122-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
122+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
123+
123124
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
124125
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
125126
fi

Standalone/start-selenium-standalone.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
142142
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
143143
fi
144144
echo "Tracing is enabled"
145-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
145+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
146+
146147
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
147148
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
148149
fi

StandaloneDocker/start-selenium-grid-docker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
115115
EXTRA_LIBS="--ext ${EXTERNAL_JARS}"
116116
fi
117117
echo "Tracing is enabled"
118-
echo "Classpath will be enriched with these external jars : " ${EXTRA_LIBS}
118+
echo "Classpath will be enriched with these external jars : ${EXTRA_LIBS}"
119+
119120
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
120121
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
121122
fi

0 commit comments

Comments
 (0)