diff --git a/publish/.env b/publish/.env index c50ba9e..73d2a79 100644 --- a/publish/.env +++ b/publish/.env @@ -36,3 +36,6 @@ DEVELOP_IMAGE=develop:latest # Container image name for gateway GATEWAY_IMAGE=gateway:latest +# Container image name for insight +INSIGHT_IMAGE=insight:latest + diff --git a/publish/docker-compose.yaml b/publish/docker-compose.yaml index 85c473a..29c2878 100644 --- a/publish/docker-compose.yaml +++ b/publish/docker-compose.yaml @@ -8,7 +8,7 @@ services: - "aspire" restart: "always" cache: - image: "docker.io/library/redis:7.4" + image: "docker.io/library/redis:8.2" command: - "-c" - "redis-server --requirepass $$REDIS_PASSWORD" @@ -41,6 +41,7 @@ services: ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" HTTP_PORTS: "8080" HTTPS_PORTS: "7001" + ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" services__pass__http__0: "http://pass:8080" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" @@ -60,9 +61,11 @@ services: ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" HTTP_PORTS: "8080" HTTPS_PORTS: "7001" + services__ring__http__0: "http://ring:8080" + services__develop__http__0: "http://develop:8080" + services__drive__http__0: "http://drive:8080" ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" - services__ring__http__0: "http://ring:8080" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" OTEL_SERVICE_NAME: "pass" @@ -80,10 +83,10 @@ services: ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" HTTP_PORTS: "8080" HTTPS_PORTS: "7001" - ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" - ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" services__pass__http__0: "http://pass:8080" services__ring__http__0: "http://ring:8080" + ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" + ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" OTEL_SERVICE_NAME: "drive" @@ -101,11 +104,11 @@ services: ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" HTTP_PORTS: "8080" HTTPS_PORTS: "7001" - ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" - ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" services__pass__http__0: "http://pass:8080" services__ring__http__0: "http://ring:8080" services__drive__http__0: "http://drive:8080" + ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" + ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" OTEL_SERVICE_NAME: "sphere" @@ -123,9 +126,11 @@ services: ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" HTTP_PORTS: "8080" HTTPS_PORTS: "7001" - ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" services__pass__http__0: "http://pass:8080" services__ring__http__0: "http://ring:8080" + services__sphere__http__0: "http://sphere:8080" + ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" + ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" OTEL_SERVICE_NAME: "develop" @@ -134,6 +139,29 @@ services: - "7001" networks: - "aspire" + insight: + image: "${INSIGHT_IMAGE}" + environment: + OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES: "true" + OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES: "true" + OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY: "in_memory" + ASPNETCORE_FORWARDEDHEADERS_ENABLED: "true" + HTTP_PORTS: "8080" + HTTPS_PORTS: "7001" + services__pass__http__0: "http://pass:8080" + services__ring__http__0: "http://ring:8080" + services__sphere__http__0: "http://sphere:8080" + services__develop__http__0: "http://develop:8080" + ConnectionStrings__cache: "cache:6379,password=${CACHE_PASSWORD}" + ConnectionStrings__queue: "nats://nats:${QUEUE_PASSWORD}@queue:4222" + OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" + OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" + OTEL_SERVICE_NAME: "insight" + expose: + - "8080" + - "7001" + networks: + - "aspire" gateway: image: "${GATEWAY_IMAGE}" environment: @@ -147,6 +175,7 @@ services: services__drive__http__0: "http://drive:8080" services__sphere__http__0: "http://sphere:8080" services__develop__http__0: "http://develop:8080" + services__insight__http__0: "http://insight:8080" OTEL_EXPORTER_OTLP_ENDPOINT: "http://docker-compose-dashboard:18889" OTEL_EXPORTER_OTLP_PROTOCOL: "grpc" OTEL_SERVICE_NAME: "gateway"