From 5a22ad546e6690900b9ee77f0266114e1bcad393 Mon Sep 17 00:00:00 2001 From: Niklas van Schrick Date: Wed, 22 Jul 2026 21:33:57 +0200 Subject: [PATCH 1/3] Add missing copy statements to sculptor dockerfile --- container/sculptor/Dockerfile.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/container/sculptor/Dockerfile.erb b/container/sculptor/Dockerfile.erb index 81e12c48..eca9ac50 100644 --- a/container/sculptor/Dockerfile.erb +++ b/container/sculptor/Dockerfile.erb @@ -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 From b96e1f8643e97b17c8f5f7ccb7db9f9af8c5ed45 Mon Sep 17 00:00:00 2001 From: Niklas van Schrick Date: Wed, 22 Jul 2026 21:34:42 +0200 Subject: [PATCH 2/3] Add environment variables for service name configurations --- docker-compose/.env | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose/.env b/docker-compose/.env index e93bfa49..8c52aab5 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -77,10 +77,11 @@ 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 +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 # Internal config options SAGITTARIUS_RAILS_HOST=sagittarius-rails-web From 133bac5f3b2c400db82f006a30af639ce40a0fba Mon Sep 17 00:00:00 2001 From: Niklas van Schrick Date: Wed, 22 Jul 2026 21:36:12 +0200 Subject: [PATCH 3/3] Add OpenTelemetry configuration for sculptor --- docker-compose/.env | 5 +++++ docker-compose/docker-compose.yml | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/docker-compose/.env b/docker-compose/.env index 8c52aab5..8e80cd47 100644 --- a/docker-compose/.env +++ b/docker-compose/.env @@ -76,12 +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_NGINX=nginx +OPENTELEMETRY_SERVICE_NAME_SCULPTOR=sculptor +OPENTELEMETRY_SERVICE_NAME_SCULPTOR_CLIENTSIDE=sculptor-clientside # Internal config options SAGITTARIUS_RAILS_HOST=sagittarius-rails-web diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2a0c9ead..ad824fd4 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -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