fixed observability dependency

plengauer · Sep 17, 2023 · 5ca974e · 5ca974e
1 parent e46108f
commit 5ca974e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/package/usr/bin/gitaptly_run_ftp.sh b/package/usr/bin/gitaptly_run_ftp.sh
@@ -9,8 +9,8 @@ if [ -n "$OTLP_TRACES_ENDPOINT" ] || [ -n "$OTLP_METRICS_ENDPOINT" ]; then
   export OTEL_METRICS_EXPORTER=otlp_proto_http
   export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="$OTLP_TRACES_ENDPOINT"
   export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="$OTLP_METRICS_ENDPOINT"
-  export OTEL_EXPORTER_OTLP_TRACES_HEADERS=authentication=$(echo "$OTLP_TRACES_HEADER" | jq -Rr @uri)
-  export OTEL_EXPORTER_OTLP_METRICS_HEADERS=authentication=$(echo "$OTLP_METRICS_HEADER" | jq -Rr @uri)
+  export OTEL_EXPORTER_OTLP_TRACES_HEADERS=authorization=$(echo "$OTLP_TRACES_HEADER" | jq -Rr @uri)
+  export OTEL_EXPORTER_OTLP_METRICS_HEADERS=authorization=$(echo "$OTLP_METRICS_HEADER" | jq -Rr @uri)
   cmd=(opentelemetry-instrument "${cmd[@]}")
 fi
 exec "${cmd[@]}"
diff --git a/package/usr/bin/gitaptly_serve.sh b/package/usr/bin/gitaptly_serve.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
 source /opt/gitaptly/env
-export OTEL_SERVICE_NAME=GitAptly
-export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="$OTLP_TRACES_ENDPOINT"
-export OTEL_EXPORTER_OTLP_TRACES_HEADERS="$OTLP_TRACES_HEADERS"
-source /usr/bin/opentelemetry_bash.sh
+if [ -f /usr/bin/opentelemetry_bash.sh ]; then
+  export OTEL_SERVICE_NAME=GitAptly
+  export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="$OTLP_TRACES_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_TRACES_HEADERS=authorization=$(echo "$OTLP_TRACES_HEADER" | jq -Rr @uri)
+  source /usr/bin/opentelemetry_bash.sh
+fi
 
 path="$SCRIPT_NAME"
 file=$(echo "$path" | rev | cut -d/ -f1 | rev)

diff --git a/package/usr/bin/gitaptly_update.sh b/package/usr/bin/gitaptly_update.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 set -e
 source /opt/gitaptly/env
-export OTEL_SERVICE_NAME=GitAptly
-export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="$OTLP_TRACES_ENDPOINT"
-export OTEL_EXPORTER_OTLP_TRACES_HEADERS="$OTLP_TRACES_HEADERS"
-source /usr/bin/opentelemetry_bash.sh
+if [ -f /usr/bin/opentelemetry_bash.sh ]; then
+  export OTEL_SERVICE_NAME=GitAptly
+  export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="$OTLP_TRACES_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_TRACES_HEADERS=authorization=$(echo "$OTLP_TRACES_HEADER" | jq -Rr @uri)
+  source /usr/bin/opentelemetry_bash.sh
+fi
 cd /var/lib/gitaptly
 
 source /opt/gitaptly/env