From 596ba43940faa401bb936c906de6d1f1936a4e33 Mon Sep 17 00:00:00 2001 From: Milo Hansen Date: Mon, 21 Apr 2025 13:40:56 -0700 Subject: [PATCH 1/2] check if OTEL_EXPORTER_* variables are both set AND not empty --- docker/run-otelcol.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/run-otelcol.sh b/docker/run-otelcol.sh index 66b0505b..e5167ecc 100755 --- a/docker/run-otelcol.sh +++ b/docker/run-otelcol.sh @@ -4,11 +4,11 @@ source ./logging.sh secondary_config_file="" -if [[ -v OTEL_EXPORTER_OTLP_ENDPOINT ]]; then +if [[ -n OTEL_EXPORTER_OTLP_ENDPOINT ]]; then echo "Also enabling OTLP/HTTP export to ${OTEL_EXPORTER_OTLP_ENDPOINT}" secondary_config_file="--config=file:./otelcol-config-export-http.yaml" - if [[ -v OTEL_EXPORTER_OTLP_HEADERS ]]; then + if [[ -n OTEL_EXPORTER_OTLP_HEADERS ]]; then echo "Adding headers from OTEL_EXPORTER_OTLP_HEADERS" yaml_headers="{" From 26dd24cc5dca9a8d14a8add8a26373f149c35387 Mon Sep 17 00:00:00 2001 From: Milo Hansen Date: Tue, 22 Apr 2025 10:19:30 -0700 Subject: [PATCH 2/2] fix the checks --- docker/run-otelcol.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/run-otelcol.sh b/docker/run-otelcol.sh index e5167ecc..a43700cf 100755 --- a/docker/run-otelcol.sh +++ b/docker/run-otelcol.sh @@ -4,11 +4,11 @@ source ./logging.sh secondary_config_file="" -if [[ -n OTEL_EXPORTER_OTLP_ENDPOINT ]]; then +if [[ -n ${OTEL_EXPORTER_OTLP_ENDPOINT} ]]; then echo "Also enabling OTLP/HTTP export to ${OTEL_EXPORTER_OTLP_ENDPOINT}" secondary_config_file="--config=file:./otelcol-config-export-http.yaml" - if [[ -n OTEL_EXPORTER_OTLP_HEADERS ]]; then + if [[ -n ${OTEL_EXPORTER_OTLP_HEADERS} ]]; then echo "Adding headers from OTEL_EXPORTER_OTLP_HEADERS" yaml_headers="{"