Skip to content

Commit 3bdcb0d

Browse files
committed
chart(fix): [regression] Able to disable tracing via config key tracing.enabled
Fixes: #2355 Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent 3589a0c commit 3bdcb0d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

Diff for: charts/selenium-grid/templates/logging-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ data:
1515
SE_LOG_LEVEL: {{ default "INFO" .Values.global.seleniumGrid.logLevel | quote }}
1616
SE_STRUCTURED_LOGS: {{ default false .Values.global.seleniumGrid.structuredLogs | quote }}
1717
SE_HTTP_LOGS: {{ default false .Values.global.seleniumGrid.httpLogs | quote }}
18+
SE_ENABLE_TRACING: {{ eq (include "seleniumGrid.enableTracing" $) "true" | ternary "true" "false" | quote }}
1819
{{- if (eq (include "seleniumGrid.enableTracing" .) "true") }}
19-
SE_ENABLE_TRACING: "true"
2020
SE_OTEL_TRACES_EXPORTER: {{ .Values.tracing.exporter | quote }}
2121
SE_OTEL_JAVA_GLOBAL_AUTOCONFIGURE_ENABLED: {{ .Values.tracing.globalAutoConfigure | quote }}
2222
SE_OTEL_EXPORTER_ENDPOINT: {{ tpl .Values.tracing.exporterEndpoint $ | quote }}

Diff for: tests/charts/templates/test.py

+10
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,16 @@ def test_enable_leftovers_cleanup(self):
241241
count += 1
242242
self.assertEqual(count, len(resources_name), "No node config resources found")
243243

244+
def test_enable_tracing(self):
245+
resources_name = ['{0}selenium-logging-config'.format(RELEASE_NAME)]
246+
count = 0
247+
for doc in LIST_OF_DOCUMENTS:
248+
if doc['metadata']['name'] in resources_name and doc['kind'] == 'ConfigMap':
249+
logger.info(f"Assert ENV vars for Tracing disabled is set to Node ConfigMap")
250+
self.assertEqual(doc['data']['SE_ENABLE_TRACING'], 'false')
251+
count += 1
252+
self.assertEqual(count, len(resources_name), "No node config resources found")
253+
244254
if __name__ == '__main__':
245255
failed = False
246256
try:

0 commit comments

Comments
 (0)