Skip to content
Draft
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
3 changes: 3 additions & 0 deletions container/sculptor/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ COPY projects/sculptor/edition.mjs \

RUN npm ci

COPY projects/sculptor/src/instrumentation.ts src/instrumentation.ts
COPY projects/sculptor/src/instrumentation-client.ts src/instrumentation-client.ts
COPY projects/sculptor/src/middleware.ts src/middleware.ts
COPY projects/sculptor/src/hooks src/hooks
COPY projects/sculptor/src/app src/app
COPY projects/sculptor/src/packages/ce src/packages/ce
Expand Down
14 changes: 10 additions & 4 deletions docker-compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,17 @@ 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
OPENTELEMETRY_LOGS_CLIENTSIDE_HTTP_ENDPOINT=http://localhost:4318/v1/logs
OPENTELEMETRY_METRICS_CLIENTSIDE_HTTP_ENDPOINT=http://localhost:4318/v1/metrics
OPENTELEMETRY_TRACES_CLIENTSIDE_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
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
OPENTELEMETRY_SERVICE_NAME_NGINX=nginx
OPENTELEMETRY_SERVICE_NAME_SCULPTOR=sculptor
OPENTELEMETRY_SERVICE_NAME_SCULPTOR_CLIENTSIDE=sculptor-clientside

# Internal config options
SAGITTARIUS_RAILS_HOST=sagittarius-rails-web
Expand Down
19 changes: 19 additions & 0 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,25 @@ services:
sculptor:
image: ${IMAGE_REGISTRY}/sculptor:${IMAGE_TAG}-${IMAGE_EDITION}
restart: unless-stopped
environment:
OPENTELEMETRY_ENABLED: ${OPENTELEMETRY_ENABLED:-false}
OTEL_SERVICE_NAME: ${OPENTELEMETRY_SERVICE_NAME_SCULPTOR}
OTEL_LOGS_ENDPOINT: ${OPENTELEMETRY_LOGS_HTTP_ENDPOINT}
OTEL_METRICS_ENDPOINT: ${OPENTELEMETRY_METRICS_HTTP_ENDPOINT}
OTEL_TRACES_ENDPOINT: ${OPENTELEMETRY_TRACES_HTTP_ENDPOINT}
NEXT_PUBLIC_OTEL_SERVICE_NAME: ${OPENTELEMETRY_SERVICE_NAME_SCULPTOR_CLIENTSIDE}
NEXT_PUBLIC_OTEL_LOGS_ENDPOINT: ${OPENTELEMETRY_LOGS_CLIENTSIDE_HTTP_ENDPOINT}
NEXT_PUBLIC_OTEL_METRICS_ENDPOINT: ${OPENTELEMETRY_METRICS_CLIENTSIDE_HTTP_ENDPOINT}
NEXT_PUBLIC_OTEL_TRACES_ENDPOINT: ${OPENTELEMETRY_TRACES_CLIENTSIDE_HTTP_ENDPOINT}
entrypoint: |
sh -c "
if [ \"$$OPENTELEMETRY_ENABLED\" != 'true' ]; then
echo 'UNSET OTEL'
unset OTEL_SERVICE_NAME OTEL_LOGS_ENDPOINT OTEL_METRICS_ENDPOINT OTEL_TRACES_ENDPOINT
unset NEXT_PUBLIC_OTEL_SERVICE_NAME NEXT_PUBLIC_OTEL_LOGS_ENDPOINT NEXT_PUBLIC_OTEL_METRICS_ENDPOINT NEXT_PUBLIC_OTEL_TRACES_ENDPOINT
fi
exec npm run start
"
profiles:
- ide

Expand Down