Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions container/config-generator/templates/nginx.default.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ server {
server_name <%= env!('HOSTNAME') %>;
<% end %>

<% if env?('OPENTELEMETRY_ENABLED') -%>
otel_trace on;
otel_trace_context propagate;
otel_span_name "$request_method $request_uri";
<% end -%>

location = /graphql {
proxy_pass http://sagittarius_rails_web;
proxy_set_header Host $host;
Expand Down
10 changes: 10 additions & 0 deletions container/config-generator/templates/nginx.otel.conf.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<% if env?('OPENTELEMETRY_ENABLED') -%>
otel_exporter {
endpoint <%= env!('OPENTELEMETRY_GRPC_HOST') %>;
interval 5s;
batch_size 512;
batch_count 4;
}

otel_service_name <%= env('OPENTELEMETRY_SERVICE_NAME_NGINX', 'nginx') %>;
<% end -%>
1 change: 1 addition & 0 deletions docker-compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ VELORUM_JWT_SECRET=088cfc7a7fc2b07696d8ee5e1ea9d642

# OpenTelemetry
OPENTELEMETRY_ENABLED=false
OPENTELEMETRY_GRPC_HOST=http://localhost:4317
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
Expand Down
17 changes: 16 additions & 1 deletion docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ services:
- generated-configs:/tmp/generated-configs:ro
environment:
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-background.yml
command:
- bundle
- exec
- good_job
restart: unless-stopped
profiles:
- ide
Expand All @@ -74,6 +78,8 @@ services:
- generated-configs:/tmp/generated-configs:ro
environment:
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-grpc.yml
command:
- bin/grpc_server
restart: unless-stopped
profiles:
- ide
Expand All @@ -87,6 +93,11 @@ services:
- generated-configs:/tmp/generated-configs:ro
environment:
SAGITTARIUS_CONFIG_FILES: /tmp/generated-configs/sagittarius.sagittarius.yml,/tmp/generated-configs/sagittarius.sagittarius-cable.yml
command:
- bundle
- exec
- puma
- config.cable.ru
restart: unless-stopped
profiles:
- ide
Expand Down Expand Up @@ -117,7 +128,7 @@ services:
- ide_velorum

nginx:
image: nginx:1.31.1-alpine-slim
image: nginx:1.31.1-alpine-otel
depends_on:
config-generator:
condition: service_completed_successfully
Expand All @@ -135,6 +146,10 @@ services:
entrypoint: |
sh -c "
cp /tmp/generated-configs/nginx.default.conf /etc/nginx/conf.d/default.conf
if [ -s /tmp/generated-configs/nginx.otel.conf ]; then
sed -i '1i load_module modules/ngx_otel_module.so;' /etc/nginx/nginx.conf
cp /tmp/generated-configs/nginx.otel.conf /etc/nginx/conf.d/otel.conf
fi
nginx -t
exec nginx -g 'daemon off;'
"
Expand Down