Skip to content

Commit 434221c

Browse files
VietND96VietND96
authored
Docker: Env var SE_OTEL_RESOURCE_ATTRIBUTES to add more tracing attributes (#2857)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 204f199 commit 434221c

13 files changed

+41
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
163163
fi
164164
echo "Tracing is enabled"
165165
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
166-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
166+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
167167
fi
168168
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
169169
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

‎ENV_VARIABLES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,8 @@
147147
| SE_EXTRA_LIBS | | Extra jars to add to the classpath in server component bootstrap | --ext |
148148
| SE_NODE_CONNECTION_LIMIT_PER_SESSION | 10 | | |
149149
| SE_SUPERVISORD_UNIX_SERVER_PASSWORD | secret | | |
150+
| SE_FFMPEG_THREADS | | | |
151+
| SE_OTEL_RESOURCE_ATTRIBUTES | | Add more attributes to the OpenTelemetry resource, e.g. "service.version=1.0.0,deployment.environment=production" | |
152+
| SE_VIDEO_BUFSIZE | | | |
153+
| SE_VIDEO_CRF | | | |
154+
| SE_VIDEO_MAXRATE | | | |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9393
fi
9494
echo "Tracing is enabled"
9595
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
96-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
96+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
9797
fi
9898
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
9999
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
143143
fi
144144
echo "Tracing is enabled"
145145
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
146-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
146+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
147147
fi
148148
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
149149
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

‎NodeBase/start-selenium-node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
142142
fi
143143
echo "Tracing is enabled"
144144
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
145-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
145+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
146146
fi
147147
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
148148
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
110110
fi
111111
echo "Tracing is enabled"
112112
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
113-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
113+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
114114
fi
115115
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
116116
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
144144
fi
145145
echo "Tracing is enabled"
146146
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
147-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
147+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
148148
fi
149149
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
150150
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
9797
fi
9898
echo "Tracing is enabled"
9999
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
100-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
100+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
101101
fi
102102
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
103103
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
119119
fi
120120
echo "Tracing is enabled"
121121
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
122-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
122+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
123123
fi
124124
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
125125
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

‎Standalone/start-selenium-standalone.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
142142
fi
143143
echo "Tracing is enabled"
144144
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
145-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
145+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
146146
fi
147147
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
148148
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if [ "${SE_ENABLE_TRACING}" = "true" ] && [ -n "${SE_OTEL_EXPORTER_ENDPOINT}" ];
115115
fi
116116
echo "Tracing is enabled"
117117
if [ -n "$SE_OTEL_SERVICE_NAME" ]; then
118-
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}"
118+
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.resource.attributes=service.name=${SE_OTEL_SERVICE_NAME}${SE_OTEL_RESOURCE_ATTRIBUTES:+,${SE_OTEL_RESOURCE_ATTRIBUTES}}"
119119
fi
120120
if [ -n "$SE_OTEL_TRACES_EXPORTER" ]; then
121121
SE_OTEL_JVM_ARGS="$SE_OTEL_JVM_ARGS -Dotel.traces.exporter=${SE_OTEL_TRACES_EXPORTER}"

‎scripts/generate_list_env_vars/description.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,18 @@
449449
- name: SE_SUPERVISORD_UNIX_SERVER_PASSWORD
450450
description: ''
451451
cli: ''
452+
- name: SE_FFMPEG_THREADS
453+
description: ''
454+
cli: ''
455+
- name: SE_OTEL_RESOURCE_ATTRIBUTES
456+
description: Add more attributes to the OpenTelemetry resource, e.g. "service.version=1.0.0,deployment.environment=production"
457+
cli: ''
458+
- name: SE_VIDEO_BUFSIZE
459+
description: ''
460+
cli: ''
461+
- name: SE_VIDEO_CRF
462+
description: ''
463+
cli: ''
464+
- name: SE_VIDEO_MAXRATE
465+
description: ''
466+
cli: ''

‎scripts/generate_list_env_vars/value.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
default: ''
3939
- name: SE_EXTRA_LIBS
4040
default: ''
41+
- name: SE_FFMPEG_THREADS
42+
default: ''
4143
- name: SE_FRAME_RATE
4244
default: '15'
4345
- name: SE_GRID_URL
@@ -81,7 +83,7 @@
8183
- name: SE_NODE_BROWSER_VERSION
8284
default: stable
8385
- name: SE_NODE_CONNECTION_LIMIT_PER_SESSION
84-
default: '200'
86+
default: '10'
8587
- name: SE_NODE_CONTAINER_NAME
8688
default: ''
8789
- name: SE_NODE_DOCKER_CONFIG_FILENAME
@@ -156,6 +158,8 @@
156158
default: 'true'
157159
- name: SE_OTEL_JVM_ARGS
158160
default: ''
161+
- name: SE_OTEL_RESOURCE_ATTRIBUTES
162+
default: ''
159163
- name: SE_OTEL_SERVICE_NAME
160164
default: selenium-event-bus
161165
- name: SE_OTEL_TRACES_EXPORTER
@@ -256,8 +260,12 @@
256260
default: ''
257261
- name: SE_UPLOAD_RETAIN_LOCAL_FILE
258262
default: ''
263+
- name: SE_VIDEO_BUFSIZE
264+
default: ''
259265
- name: SE_VIDEO_CONTAINER_NAME
260266
default: ''
267+
- name: SE_VIDEO_CRF
268+
default: ''
261269
- name: SE_VIDEO_FILE_NAME
262270
default: video.mp4
263271
- name: SE_VIDEO_FILE_NAME_SUFFIX
@@ -270,6 +278,8 @@
270278
default: ''
271279
- name: SE_VIDEO_INTERNAL_UPLOAD
272280
default: 'true'
281+
- name: SE_VIDEO_MAXRATE
282+
default: ''
273283
- name: SE_VIDEO_POLL_INTERVAL
274284
default: '1'
275285
- name: SE_VIDEO_RECORD_STANDALONE

0 commit comments

Comments
 (0)