Skip to content

Commit d77635c

Browse files
author
Andrei Neagu
committed
tracing can be disabled on all services which use it
1 parent 4abb9f2 commit d77635c

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

‎.env-devel‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
2121
API_SERVER_DEV_FEATURES_ENABLED=0
2222
API_SERVER_LOGLEVEL=INFO
2323
API_SERVER_PROFILING=1
24+
API_SERVER_TRACING={}
2425
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
2526

2627
AUTOSCALING_DASK=null
@@ -33,6 +34,7 @@ AUTOSCALING_LOGLEVEL=INFO
3334
AUTOSCALING_NODES_MONITORING=null
3435
AUTOSCALING_POLL_INTERVAL=10
3536
AUTOSCALING_SSM_ACCESS=null
37+
AUTOSCALING_TRACING={}
3638

3739
AWS_S3_CLI_S3=null
3840

@@ -44,6 +46,7 @@ CATALOG_PORT=8000
4446
CATALOG_PROFILING=1
4547
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
4648
CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
49+
CATALOG_TRACING={}
4750

4851
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
4952
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
@@ -57,6 +60,7 @@ CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
5760
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
5861
CLUSTERS_KEEPER_TASK_INTERVAL=30
5962
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
63+
CLUSTERS_KEEPER_TRACING={}
6064

6165
DASK_SCHEDULER_HOST=dask-scheduler
6266
DASK_SCHEDULER_PORT=8786
@@ -70,6 +74,7 @@ DIRECTOR_HOST=director
7074
DIRECTOR_PORT=8080
7175
DIRECTOR_REGISTRY_CACHING_TTL=900
7276
DIRECTOR_REGISTRY_CACHING=True
77+
DIRECTOR_TRACING={}
7378

7479
EFS_USER_ID=8006
7580
EFS_USER_NAME=efs
@@ -79,6 +84,10 @@ EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
7984
EFS_MOUNTED_PATH=/tmp/efs
8085
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
8186
EFS_ONLY_ENABLED_FOR_USERIDS=[]
87+
EFS_GUARDIAN_TRACING={}
88+
89+
# DATCORE_ADAPTER
90+
DATCORE_ADAPTER_TRACING={}
8291

8392
# DIRECTOR_V2 ----
8493
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
@@ -105,10 +114,13 @@ DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
105114
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
106115
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
107116
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
108-
# DIRECTOR_V2 ----
117+
DIRECTOR_V2_TRACING={}
118+
119+
# DYNAMIC_SCHEDULER ----
109120
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
110121
DYNAMIC_SCHEDULER_PROFILING=1
111122
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=PT1H
123+
DYNAMIC_SCHEDULER_TRACING={}
112124

113125
FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
114126

@@ -122,6 +134,7 @@ INVITATIONS_PORT=8000
122134
INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
123135
INVITATIONS_SWAGGER_API_DOC_ENABLED=1
124136
INVITATIONS_USERNAME=admin
137+
INVITATIONS_TRACING={}
125138

126139
LOG_FORMAT_LOCAL_DEV_ENABLED=1
127140
LOG_FILTER_MAPPING='{}'
@@ -146,6 +159,7 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
146159
PAYMENTS_STRIPE_URL=https://api.stripe.com
147160
PAYMENTS_SWAGGER_API_DOC_ENABLED=1
148161
PAYMENTS_USERNAME=admin
162+
PAYMENTS_TRACING={}
149163

150164
POSTGRES_DB=simcoredb
151165
POSTGRES_ENDPOINT=postgres:5432
@@ -185,6 +199,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
185199
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
186200
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
187201
RESOURCE_USAGE_TRACKER_S3=null
202+
RESOURCE_USAGE_TRACKER_TRACING={}
188203

189204
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
190205
R_CLONE_OPTION_BUFFER_SIZE=0M
@@ -218,6 +233,7 @@ STORAGE_HOST=storage
218233
STORAGE_LOGLEVEL=INFO
219234
STORAGE_PORT=8080
220235
STORAGE_PROFILING=1
236+
STORAGE_TRACING={}
221237
# STORAGE ----
222238

223239
SWARM_STACK_NAME=master-simcore

‎services/docker-compose.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ services:
4242
WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
4343
WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
4444
WEBSERVER_SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
45+
API_SERVER_TRACING: ${API_SERVER_TRACING}
4546
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
4647
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
4748

@@ -127,6 +128,7 @@ services:
127128
REGISTRY_URL: ${REGISTRY_URL}
128129
REGISTRY_SSL: ${REGISTRY_SSL}
129130
REGISTRY_AUTH: ${REGISTRY_AUTH}
131+
AUTOSCALING_TRACING: ${AUTOSCALING_TRACING}
130132
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
131133
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
132134
volumes:
@@ -168,6 +170,7 @@ services:
168170
RABBIT_PORT: ${RABBIT_PORT}
169171
RABBIT_SECURE: ${RABBIT_SECURE}
170172
RABBIT_USER: ${RABBIT_USER}
173+
CATALOG_TRACING: ${CATALOG_TRACING}
171174
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
172175
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
173176
networks:
@@ -236,6 +239,7 @@ services:
236239
WORKERS_EC2_INSTANCES_SECURITY_GROUP_IDS: ${WORKERS_EC2_INSTANCES_SECURITY_GROUP_IDS}
237240
WORKERS_EC2_INSTANCES_SUBNET_ID: ${WORKERS_EC2_INSTANCES_SUBNET_ID}
238241
WORKERS_EC2_INSTANCES_CUSTOM_TAGS: ${WORKERS_EC2_INSTANCES_CUSTOM_TAGS}
242+
CLUSTERS_KEEPER_TRACING: ${CLUSTERS_KEEPER_TRACING}
239243
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
240244
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
241245
secrets: *dask_tls_secrets
@@ -278,6 +282,7 @@ services:
278282
SIMCORE_SERVICES_NETWORK_NAME: interactive_services_subnet
279283
STORAGE_ENDPOINT: ${STORAGE_ENDPOINT}
280284
SWARM_STACK_NAME: ${SWARM_STACK_NAME:-simcore}
285+
DIRECTOR_TRACING: ${DIRECTOR_TRACING}
281286
TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE}
282287
TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT}
283288
TRAEFIK_SIMCORE_ZONE: ${TRAEFIK_SIMCORE_ZONE:-internal_simcore_stack}
@@ -383,6 +388,7 @@ services:
383388
SIMCORE_SERVICES_NETWORK_NAME: ${SIMCORE_SERVICES_NETWORK_NAME}
384389
SWARM_STACK_NAME: ${SWARM_STACK_NAME}
385390
TRAEFIK_SIMCORE_ZONE: ${TRAEFIK_SIMCORE_ZONE}
391+
DIRECTOR_V2_TRACING: ${DIRECTOR_V2_TRACING}
386392
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
387393
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
388394

@@ -434,6 +440,7 @@ services:
434440
EFS_MOUNTED_PATH: ${EFS_MOUNTED_PATH}
435441
EFS_ONLY_ENABLED_FOR_USERIDS: ${EFS_ONLY_ENABLED_FOR_USERIDS}
436442
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: ${EFS_PROJECT_SPECIFIC_DATA_DIRECTORY}
443+
EFS_GUARDIAN_TRACING: ${EFS_GUARDIAN_TRACING}
437444
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
438445
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
439446
invitations:
@@ -452,6 +459,7 @@ services:
452459
INVITATIONS_USERNAME: ${INVITATIONS_USERNAME}
453460
LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
454461
LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
462+
INVITATIONS_TRACING: ${INVITATIONS_TRACING}
455463
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
456464
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
457465
payments:
@@ -496,6 +504,7 @@ services:
496504
SMTP_PORT: ${SMTP_PORT}
497505
SMTP_PROTOCOL: ${SMTP_PROTOCOL}
498506
SMTP_USERNAME: ${SMTP_USERNAME}
507+
PAYMENTS_TRACING: ${PAYMENTS_TRACING}
499508
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
500509
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
501510

@@ -532,6 +541,7 @@ services:
532541
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC}
533542
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL}
534543
RESOURCE_USAGE_TRACKER_S3: ${RESOURCE_USAGE_TRACKER_S3}
544+
RESOURCE_USAGE_TRACKER_TRACING: ${RESOURCE_USAGE_TRACKER_TRACING}
535545
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
536546
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
537547
RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_PORT}
@@ -560,6 +570,7 @@ services:
560570
DYNAMIC_SCHEDULER_LOGLEVEL: ${DYNAMIC_SCHEDULER_LOGLEVEL}
561571
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT: ${DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT}
562572
DYNAMIC_SCHEDULER_PROFILING: ${DYNAMIC_SCHEDULER_PROFILING}
573+
DYNAMIC_SCHEDULER_TRACING: ${DYNAMIC_SCHEDULER_TRACING}
563574
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
564575
TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
565576
static-webserver:

0 commit comments

Comments
 (0)