Merge pull request #932 from code0-tech/895-add-opentelemetry-support/sagittarius

Add OpenTelemetry configuration for sagittarius

Author: Taucher2003

container/config-generator/templates/sagittarius.sagittarius-background.yml.erb

@@ -0,0 +1,4 @@
+<% if env?('OPENTELEMETRY_ENABLED') %>
+opentelemetry:
+  service_name: <%= env('OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_BACKGROUND', 'sagittarius-background') %>
+<% end %>

container/config-generator/templates/sagittarius.sagittarius-cable.yml.erb

@@ -0,0 +1,4 @@
+<% if env?('OPENTELEMETRY_ENABLED') %>
+opentelemetry:
+  service_name: <%= env('OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_CABLE', 'sagittarius-cable') %>
+<% end %>

container/config-generator/templates/sagittarius.sagittarius-grpc.yml.erb

@@ -0,0 +1,4 @@
+<% if env?('OPENTELEMETRY_ENABLED') %>
+opentelemetry:
+  service_name: <%= env('OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_GRPC', 'sagittarius-grpc') %>
+<% end %>

container/config-generator/templates/sagittarius.sagittarius-web.yml.erb

@@ -0,0 +1,4 @@
+<% if env?('OPENTELEMETRY_ENABLED') %>
+opentelemetry:
+  service_name: <%= env('OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_WEB', 'sagittarius-web') %>
+<% end %>

container/config-generator/templates/sagittarius.sagittarius.yml.erb

@@ -24,3 +24,12 @@ velorum:
   host: <%= env!('VELORUM_HOST') %>:<%= env!('VELORUM_PORT') %>
   jwt_secret: <%= env!('VELORUM_JWT_SECRET') %>
 <% end -%>
+
+opentelemetry:
+<% opentelemetry_enabled = env?('OPENTELEMETRY_ENABLED') %>
+  enabled: <%= opentelemetry_enabled %>
+<% if opentelemetry_enabled %>
+  logs_endpoint: <%= env!('OPENTELEMETRY_LOGS_HTTP_ENDPOINT') %>
+  metrics_endpoint: <%= env!('OPENTELEMETRY_METRICS_HTTP_ENDPOINT') %>
+  traces_endpoint: <%= env!('OPENTELEMETRY_TRACES_HTTP_ENDPOINT') %>
+<% end %>

docker-compose/.env

@@ -70,6 +70,17 @@ VELORUM_JWT_SECRET=088cfc7a7fc2b07696d8ee5e1ea9d642
 # token cost multiplier for this model
 # VELORUM_MODEL_GPT5_TOKEN_COST=1
 
+# OpenTelemetry
+OPENTELEMETRY_ENABLED=false
+OPENTELEMETRY_LOGS_HTTP_ENDPOINT=http://localhost:4318/v1/logs
+OPENTELEMETRY_METRICS_HTTP_ENDPOINT=http://localhost:4318/v1/metrics
+OPENTELEMETRY_TRACES_HTTP_ENDPOINT=http://localhost:4318/v1/traces
+
+# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_WEB=sagittarius-web
+# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_CABLE=sagittarius-cable
+# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_GRPC=sagittarius-grpc
+# OPENTELEMETRY_SERVICE_NAME_SAGITTARIUS_BACKGROUND=sagittarius-background
+
 # Internal config options
 SAGITTARIUS_RAILS_HOST=sagittarius-rails-web
 SAGITTARIUS_RAILS_PORT=3000

docker-compose/docker-compose.yml

@@ -40,13 +40,9 @@ services:
       INITIAL_ROOT_PASSWORD: ${INITIAL_ROOT_PASSWORD}
       INITIAL_ROOT_MAIL: ${INITIAL_ROOT_MAIL}
       INITIAL_RUNTIME_TOKEN: ${INITIAL_RUNTIME_TOKEN}
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-web.yml
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint ./bin/rails server
-      "
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "curl --fail http://localhost:3000/health/liveness"]
@@ -63,11 +59,8 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint bundle exec good_job
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-background.yml
     restart: unless-stopped
     profiles:
       - ide
@@ -79,11 +72,8 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint ./bin/grpc_server
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-grpc.yml
     restart: unless-stopped
     profiles:
       - ide
@@ -95,11 +85,8 @@ services:
         condition: service_healthy
     volumes:
       - generated-configs:/tmp/generated-configs:ro
-    entrypoint: |
-      sh -c "
-        cp /tmp/generated-configs/sagittarius.sagittarius.yml config/sagittarius.yml
-        exec bin/docker-entrypoint bundle exec puma config.cable.ru
-      "
+    environment:
+      SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-cable.yml
     restart: unless-stopped
     profiles:
       - ide