From dad349780f4d24f31c80d6606612f0ee725aeb81 Mon Sep 17 00:00:00 2001 From: Oleksii Sholik Date: Mon, 27 Oct 2025 16:10:54 +0100 Subject: [PATCH 1/2] Use the standard OTEL_RESOURCE_ATTRIBUTES env variables since Docker now supports it --- packages/sync-service/dev/docker-compose-otel.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/sync-service/dev/docker-compose-otel.yml b/packages/sync-service/dev/docker-compose-otel.yml index 87bdac6256..4a1f73c001 100644 --- a/packages/sync-service/dev/docker-compose-otel.yml +++ b/packages/sync-service/dev/docker-compose-otel.yml @@ -27,7 +27,7 @@ services: ELECTRIC_OTLP_ENDPOINT: http://otel:4318/ ELECTRIC_PROMETHEUS_PORT: ${ELECTRIC_PROMETHEUS_PORT:-4000} DATABASE_URL: postgresql://postgres:password@postgres:5432/electric - OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES_FOR_DOCKER_COMPOSE} + OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES} ports: - 3000:3000 - 4000:4000 @@ -37,9 +37,7 @@ services: ELECTRIC_HNY_DATASET: ${ELECTRIC_HNY_DATASET} ELECTRIC_HNY_API_KEY: ${ELECTRIC_HNY_API_KEY} PROMETHEUS_SCRAPE_ENDPOINT: electric:4000 - # Need to set OTEL_RESOURCE_ATTRIBUTES_FOR_DOCKER_COMPOSE - # see https://github.com/docker/cli/issues/4958 - OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES_FOR_DOCKER_COMPOSE} + OTEL_RESOURCE_ATTRIBUTES: ${OTEL_RESOURCE_ATTRIBUTES} ports: - 4317:4317 - 4318:4318 From 2f22c51e4dc6d3dcf86f8d41d84e2af4685370d7 Mon Sep 17 00:00:00 2001 From: Oleksii Sholik Date: Mon, 3 Nov 2025 14:32:32 +0100 Subject: [PATCH 2/2] Fix the definition for postgres service in docker-compose-otel.yml --- packages/sync-service/dev/docker-compose-otel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sync-service/dev/docker-compose-otel.yml b/packages/sync-service/dev/docker-compose-otel.yml index 4a1f73c001..e05c55470b 100644 --- a/packages/sync-service/dev/docker-compose-otel.yml +++ b/packages/sync-service/dev/docker-compose-otel.yml @@ -14,7 +14,7 @@ services: - ./postgres.conf:/etc/postgresql.conf:ro - ./init.sql:/docker-entrypoint-initdb.d/00_shared_init.sql:ro tmpfs: - - /var/lib/postgresql/data + - /var/lib/postgresql - /tmp entrypoint: - docker-entrypoint.sh