From d4c0a1895237a8567afa635ef11519326746fc74 Mon Sep 17 00:00:00 2001 From: Peter Nickolov Date: Thu, 8 Feb 2024 07:51:01 -0800 Subject: [PATCH] improve startup file handling of env vars --- startup.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/startup.sh b/startup.sh index 012563b..ad841ab 100644 --- a/startup.sh +++ b/startup.sh @@ -1,6 +1,12 @@ #!/bin/sh -export OTEL_RESOURCE_ATTRIBUTES="$OTEL_RESOURCE_ATTRIBUTES","container.id="$(sed -rn "/\/sys\/fs\/cgroup\/devices/ s#.*/(cri-containerd-)?([0-9a-f]{64})(\.scope)? .*#\2#p" /proc/self/mountinfo) +if [[ -n "$OTEL_RESOURCE_ATTRIBUTES" ]]; then + OTEL_RESOURCE_ATTRIBUTES="$OTEL_RESOURCE_ATTRIBUTES," +fi +export OTEL_RESOURCE_ATTRIBUTES="${OTEL_RESOURCE_ATTRIBUTES}container.id="$(sed -rn "/\/sys\/fs\/cgroup\/devices/ s#.*/(cri-containerd-)?([0-9a-f]{64})(\.scope)? .*#\2#p" /proc/self/mountinfo) echo "Starting 'co-http $@' with the following environment variables:" echo "OTEL_EXPORTER_OTLP_ENDPOINT=$OTEL_EXPORTER_OTLP_ENDPOINT" +echo "OTEL_EXPORTER_OTLP_INSECURE=$OTEL_EXPORTER_OTLP_INSECURE" echo "OTEL_RESOURCE_ATTRIBUTES=$OTEL_RESOURCE_ATTRIBUTES" +echo "OTEL_TRACES_EXPORTER=$OTEL_TRACES_EXPORTER" +echo "OTEL_SERVICE_NAME=$OTEL_SERVICE_NAME" exec /co-http "$@" \ No newline at end of file