added logs configuration

plengauer · Oct 9, 2023 · d1730fa · d1730fa
1 parent bc8484f
commit d1730fa
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/package/DEBIAN/config b/package/DEBIAN/config
@@ -26,4 +26,12 @@ db_beginblock
 db_input high gitaptly/OTLP_METRICS_HEADER || true
 db_endblock
 
+db_beginblock
+db_input high gitaptly/OTLP_LOGS_ENDPOINT || true
+db_endblock
+
+db_beginblock
+db_input high gitaptly/OTLP_LOGS_HEADER || true
+db_endblock
+
 db_go
diff --git a/package/DEBIAN/control b/package/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: gitaptly
-Version: 2.8.2
+Version: 2.9.0
 Architecture: all
 Depends: debconf, bash, jq, cron, gzip, dpkg-dev, wget, python3, python3-pip, python3-venv
 Suggests: opentelemetry-shell (>= 1.0.0)

diff --git a/package/DEBIAN/templates b/package/DEBIAN/templates
@@ -22,6 +22,12 @@ Default:
 Description: OTLP Endpoint:
  Define the OTLP Metrics Endpoint to send metrics to, empty if no observability data should be collected.
 
+Template: gitaptly/OTLP_LOGS_ENDPOINT
+Type: string
+Default:
+Description: OTLP Endpoint:
+ Define the OTLP Logs Endpoint to send metrics to, empty if no observability data should be collected.
+
 Template: gitaptly/OTLP_TRACES_HEADER
 Type: string
 Default:
@@ -33,3 +39,9 @@ Type: string
 Default:
 Description: OTLP Metrics API Token:
  Define the API Token for the OTLP Metrics Endpoint, empty if none is required.
+
+Template: gitaptly/OTLP_LOGS_HEADER
+Type: string
+Default:
+Description: OTLP Logs API Token:
+ Define the API Token for the OTLP Logs Endpoint, empty if none is required.
diff --git a/package/usr/bin/gitaptly_serve.sh b/package/usr/bin/gitaptly_serve.sh
@@ -5,6 +5,10 @@ if [ -f /usr/bin/opentelemetry_shell.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)
+  export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="$OTLP_METRICS_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_METRICS_HEADERS=authorization=$(echo "$OTLP_METRICS_HEADER" | jq -Rr @uri)
+  export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT="$OTLP_LOGS_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_LOGS_HEADERS=authorization=$(echo "$OTLP_LOGS_HEADER" | jq -Rr @uri)
   source /usr/bin/opentelemetry_shell.sh
 fi
 

diff --git a/package/usr/bin/gitaptly_update.sh b/package/usr/bin/gitaptly_update.sh
@@ -5,6 +5,10 @@ if [ -f /usr/bin/opentelemetry_shell.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)
+  export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="$OTLP_METRICS_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_METRICS_HEADERS=authorization=$(echo "$OTLP_METRICS_HEADER" | jq -Rr @uri)
+  export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT="$OTLP_LOGS_ENDPOINT"
+  export OTEL_EXPORTER_OTLP_LOGS_HEADERS=authorization=$(echo "$OTLP_LOGS_HEADER" | jq -Rr @uri)
   source /usr/bin/opentelemetry_shell.sh
   otel_instrument dpkg-scanpackages
   otel_outstrument cut