From 5687befc9dbc0e0211522476743841ca995bfeb9 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sat, 27 Jul 2024 03:48:08 +0100 Subject: [PATCH] ci: use correct service name in `docker-compose.yml` (#6055) The compose service I defined is called `otel` not `otlp`. With this fix in place, the relay successfully connects to the OTLP exporter. it is worthwhile noting that the connection to the OTLP exporter itself is not critical for relay operation. Even if it fails, it won't affect the actual data plane. I do think it makes sense to still have a working OTLP exporter in the compose definition. As it makes it easier to test whether the ingestion of metrics and traces works as expected. --- .github/workflows/_integration_tests.yml | 1 + docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/_integration_tests.yml b/.github/workflows/_integration_tests.yml index 8a16cacf9..e672d9681 100644 --- a/.github/workflows/_integration_tests.yml +++ b/.github/workflows/_integration_tests.yml @@ -145,6 +145,7 @@ jobs: # Start one-by-one to avoid variability in service startup order docker compose up -d dns.httpbin httpbin download.httpbin docker compose up -d api web domain --no-build + docker compose up -d otel --no-build docker compose up -d relay-1 --no-build docker compose up -d relay-2 --no-build docker compose up -d gateway --no-build diff --git a/docker-compose.yml b/docker-compose.yml index 63153b7e2..7d59f80c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -429,7 +429,7 @@ services: RUST_LOG: ${RUST_LOG:-debug} RUST_BACKTRACE: 1 FIREZONE_API_URL: ws://api:8081 - OTLP_GRPC_ENDPOINT: otlp:4317 + OTLP_GRPC_ENDPOINT: otel:4317 build: target: dev context: rust @@ -470,7 +470,7 @@ services: RUST_LOG: ${RUST_LOG:-debug} RUST_BACKTRACE: 1 FIREZONE_API_URL: ws://api:8081 - OTLP_GRPC_ENDPOINT: otlp:4317 + OTLP_GRPC_ENDPOINT: otel:4317 build: target: dev context: rust