Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion services/jaeger/docker-compose.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
2 changes: 0 additions & 2 deletions services/jaeger/opentelemetry-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion services/jaeger/template.env
Original file line number Diff line number Diff line change
Expand Up @@ -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}
1 change: 1 addition & 0 deletions services/simcore/docker-compose.deploy.aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions services/simcore/docker-compose.deploy.dalco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions services/simcore/docker-compose.deploy.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions services/simcore/docker-compose.deploy.master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions services/simcore/docker-compose.deploy.public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions services/traefik/template.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading