diff --git a/services/jaeger/docker-compose.yml.j2 b/services/jaeger/docker-compose.yml.j2 index 4398652f..a04a3649 100644 --- a/services/jaeger/docker-compose.yml.j2 +++ b/services/jaeger/docker-compose.yml.j2 @@ -52,7 +52,6 @@ services: - interactive_services_subnet environment: TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} - TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE} TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT} TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL: ${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL} diff --git a/services/jaeger/opentelemetry-collector-config.yaml b/services/jaeger/opentelemetry-collector-config.yaml index 6f32b629..25dceca1 100644 --- a/services/jaeger/opentelemetry-collector-config.yaml +++ b/services/jaeger/opentelemetry-collector-config.yaml @@ -25,8 +25,6 @@ processors: batch: timeout: 5s send_batch_size: ${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} - probabilistic_sampler: - sampling_percentage: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE} filter/drop_healthcheck: error_mode: ignore traces: diff --git a/services/jaeger/template.env b/services/jaeger/template.env index c0bf5a4e..bf5b592e 100644 --- a/services/jaeger/template.env +++ b/services/jaeger/template.env @@ -3,7 +3,6 @@ MONITORING_DOMAIN=${MONITORING_DOMAIN} PUBLIC_NETWORK=${PUBLIC_NETWORK} MONITORED_NETWORK=${MONITORED_NETWORK} TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=${TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE} -TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE} TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT} TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL=${TRACING_OPENTELEMETRY_COLLECTOR_SERVICE_TELEMETRY_LOG_LEVEL} SWARM_STACK_NAME=${SWARM_STACK_NAME} diff --git a/services/simcore/docker-compose.deploy.aws.yml b/services/simcore/docker-compose.deploy.aws.yml index da264fa8..9e153daf 100644 --- a/services/simcore/docker-compose.deploy.aws.yml +++ b/services/simcore/docker-compose.deploy.aws.yml @@ -59,6 +59,7 @@ services: - "--tracing.serviceName=simcore-traefik" - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces" - "--tracing.addinternals=false" + - "--tracing.sampleRate=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY}" deploy: resources: limits: diff --git a/services/simcore/docker-compose.deploy.dalco.yml b/services/simcore/docker-compose.deploy.dalco.yml index 441acc89..ab647946 100644 --- a/services/simcore/docker-compose.deploy.dalco.yml +++ b/services/simcore/docker-compose.deploy.dalco.yml @@ -54,6 +54,7 @@ services: - "--tracing.serviceName=simcore-traefik" - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces" - "--tracing.addinternals=false" + - "--tracing.sampleRate=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY}" deploy: resources: limits: diff --git a/services/simcore/docker-compose.deploy.local.yml b/services/simcore/docker-compose.deploy.local.yml index a98136e6..f623ec66 100644 --- a/services/simcore/docker-compose.deploy.local.yml +++ b/services/simcore/docker-compose.deploy.local.yml @@ -111,6 +111,8 @@ services: - "--tracing.serviceName=simcore-traefik" - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces" - "--tracing.addinternals=false" + - "--tracing.sampleRate=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY}" + deploy: labels: # oSparc postgres diff --git a/services/simcore/docker-compose.deploy.master.yml b/services/simcore/docker-compose.deploy.master.yml index 57f8250a..31f8d2b5 100644 --- a/services/simcore/docker-compose.deploy.master.yml +++ b/services/simcore/docker-compose.deploy.master.yml @@ -92,6 +92,7 @@ services: - "--tracing.serviceName=simcore-traefik" - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces" - "--tracing.addinternals=false" + - "--tracing.sampleRate=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY}" deploy: resources: limits: diff --git a/services/simcore/docker-compose.deploy.public.yml b/services/simcore/docker-compose.deploy.public.yml index c5c0747a..16cb034b 100644 --- a/services/simcore/docker-compose.deploy.public.yml +++ b/services/simcore/docker-compose.deploy.public.yml @@ -48,6 +48,8 @@ services: - "--tracing.serviceName=simcore-traefik" - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces" - "--tracing.addinternals=false" + - "--tracing.sampleRate=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY}" + deploy: labels: - prometheus-job=traefik_simcore_production diff --git a/services/traefik/template.env b/services/traefik/template.env index 80a62262..ed95f632 100644 --- a/services/traefik/template.env +++ b/services/traefik/template.env @@ -103,4 +103,5 @@ TRAEFIK_PROVIDERS_FILE_WATCH=true # Tracing TRAEFIK_TRACING_ADDINTERNALS=false TRAEFIK_TRACING_OTLP_HTTP_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT} +TRAEFIK_TRACING_SAMPLERATE=${TRACING_OPENTELEMETRY_SAMPLING_PROBABILITY} TRAEFIK_TRACING_SERVICENAME=ops-traefik