From ca58773bdf16f1acde4725a50f933216001e7654 Mon Sep 17 00:00:00 2001 From: Oscar Reyes Date: Wed, 2 Oct 2024 10:10:26 -0600 Subject: [PATCH] updates for trace mode --- collector.config.yaml | 2 +- docker-compose.e2e.yml | 3 ++- docker-compose.yml | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/collector.config.yaml b/collector.config.yaml index 7cf9688..67b9b53 100644 --- a/collector.config.yaml +++ b/collector.config.yaml @@ -37,5 +37,5 @@ service: exporters: [otlp] traces/agent: receivers: [otlp] - processors: [filter, batch] + processors: [batch] exporters: [otlp/trace] diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index f3cdb25..abba4c8 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -3,10 +3,11 @@ name: pokeshop services: tracetest-agent: - image: kubeshop/tracetest-agent:latest + image: kubeshop/tracetest-agent:dev environment: TRACETEST_DEV: ${TRACETEST_DEV} TRACETEST_API_KEY: ${TRACETEST_AGENT_API_KEY} TRACETEST_SERVER_URL: ${TRACETEST_SERVER_URL} TRACETEST_ENVIRONMENT_ID: ${TRACETEST_ENVIRONMENT_ID} + TRACETEST_TRACE_MODE: ${TRACETEST_TRACE_MODE} diff --git a/docker-compose.yml b/docker-compose.yml index f25d677..db511bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,9 +55,6 @@ services: restart: unless-stopped extra_hosts: - 'host.docker.internal:host-gateway' - ports: - - 4317:4317 - - 4318:4318 command: - '--config' - '/otel-local-config.yaml' @@ -78,7 +75,7 @@ services: ZIPKIN_URL: http://localhost:9411 healthcheck: test: ['CMD', 'wget', '--spider', 'localhost:8081/pokemon/healthcheck'] - interval: 1s + interval: 1m timeout: 3s retries: 60 ports: @@ -106,7 +103,7 @@ services: NPM_RUN_COMMAND: rpc healthcheck: test: ['CMD', 'wget', '--spider', 'localhost:8081/pokemon/healthcheck'] - interval: 1s + interval: 1m timeout: 3s retries: 60 ports: