♻️ tracing can be disabled on all services (#6682)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

.env-devel

@@ -21,6 +21,7 @@ AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
 API_SERVER_DEV_FEATURES_ENABLED=0
 API_SERVER_LOGLEVEL=INFO
 API_SERVER_PROFILING=1
+API_SERVER_TRACING={}
 TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
 
 AUTOSCALING_DASK=null
@@ -33,6 +34,7 @@ AUTOSCALING_LOGLEVEL=INFO
 AUTOSCALING_NODES_MONITORING=null
 AUTOSCALING_POLL_INTERVAL=10
 AUTOSCALING_SSM_ACCESS=null
+AUTOSCALING_TRACING={}
 
 AWS_S3_CLI_S3=null
 
@@ -44,6 +46,7 @@ CATALOG_PORT=8000
 CATALOG_PROFILING=1
 CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
 CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
+CATALOG_TRACING={}
 
 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"}'
 CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
@@ -57,6 +60,7 @@ CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
 CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
 CLUSTERS_KEEPER_TASK_INTERVAL=30
 CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
+CLUSTERS_KEEPER_TRACING={}
 
 DASK_SCHEDULER_HOST=dask-scheduler
 DASK_SCHEDULER_PORT=8786
@@ -70,6 +74,7 @@ DIRECTOR_HOST=director
 DIRECTOR_PORT=8080
 DIRECTOR_REGISTRY_CACHING_TTL=900
 DIRECTOR_REGISTRY_CACHING=True
+DIRECTOR_TRACING={}
 
 EFS_USER_ID=8006
 EFS_USER_NAME=efs
@@ -79,6 +84,10 @@ EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
 EFS_MOUNTED_PATH=/tmp/efs
 EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
 EFS_ONLY_ENABLED_FOR_USERIDS=[]
+EFS_GUARDIAN_TRACING={}
+
+# DATCORE_ADAPTER
+DATCORE_ADAPTER_TRACING={}
 
 # DIRECTOR_V2 ----
 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
 DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
 DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
 DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
-# DIRECTOR_V2 ----
+DIRECTOR_V2_TRACING={}
+
+# DYNAMIC_SCHEDULER ----
 DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
 DYNAMIC_SCHEDULER_PROFILING=1
 DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=PT1H
+DYNAMIC_SCHEDULER_TRACING={}
 
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 
@@ -122,6 +134,7 @@ INVITATIONS_PORT=8000
 INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
 INVITATIONS_SWAGGER_API_DOC_ENABLED=1
 INVITATIONS_USERNAME=admin
+INVITATIONS_TRACING={}
 
 LOG_FORMAT_LOCAL_DEV_ENABLED=1
 LOG_FILTER_MAPPING='{}'
@@ -146,6 +159,7 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
 PAYMENTS_STRIPE_URL=https://api.stripe.com
 PAYMENTS_SWAGGER_API_DOC_ENABLED=1
 PAYMENTS_USERNAME=admin
+PAYMENTS_TRACING={}
 
 POSTGRES_DB=simcoredb
 POSTGRES_ENDPOINT=postgres:5432
@@ -185,6 +199,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
 RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
 RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
 RESOURCE_USAGE_TRACKER_S3=null
+RESOURCE_USAGE_TRACKER_TRACING={}
 
 # NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
 R_CLONE_OPTION_BUFFER_SIZE=0M
@@ -218,6 +233,7 @@ STORAGE_HOST=storage
 STORAGE_LOGLEVEL=INFO
 STORAGE_PORT=8080
 STORAGE_PROFILING=1
+STORAGE_TRACING={}
 # STORAGE ----
 
 SWARM_STACK_NAME=master-simcore

services/api-server/tests/unit/conftest.py

@@ -62,6 +62,7 @@ def app_environment(
             "WEBSERVER_HOST": "webserver",
             "API_SERVER_POSTGRES": "null",
             "API_SERVER_RABBITMQ": "null",
+            "API_SERVER_TRACING": "null",
             "LOG_LEVEL": "debug",
             "SC_BOOT_MODE": "production",
             "API_SERVER_HEALTH_CHECK_TASK_PERIOD_SECONDS": "3",

services/autoscaling/tests/unit/conftest.py

@@ -226,7 +226,7 @@ def app_environment(
             "AUTOSCALING_EC2_SECRET_ACCESS_KEY": faker.pystr(),
             "AUTOSCALING_EC2_INSTANCES": "{}",
             "AUTOSCALING_SSM_ACCESS": "{}",
-            "AUTOSCALING_TRACING": "{}",
+            "AUTOSCALING_TRACING": "null",
             "SSM_ACCESS_KEY_ID": faker.pystr(),
             "SSM_SECRET_ACCESS_KEY": faker.pystr(),
             "EC2_INSTANCES_KEY_NAME": faker.pystr(),
@@ -367,13 +367,6 @@ def disabled_ec2(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch)
     monkeypatch.setenv("AUTOSCALING_EC2_ACCESS", "null")
 
 
-@pytest.fixture
-def disabled_opentelemetry(
-    app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    monkeypatch.setenv("AUTOSCALING_TRACING", "null")
-
-
 @pytest.fixture
 def disabled_ssm(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("AUTOSCALING_SSM_ACCESS", "null")

services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py

@@ -79,7 +79,6 @@ def minimal_configuration(
     local_dask_scheduler_server_envs: EnvVarsDict,
     mocked_ec2_instances_envs: EnvVarsDict,
     disabled_rabbitmq: None,
-    disabled_opentelemetry: None,
     disable_dynamic_service_background_task: None,
     disable_buffers_pool_background_task: None,
     mocked_redis_server: None,

services/catalog/tests/unit/conftest.py

@@ -86,7 +86,10 @@ def app_environment(
     """
     return setenvs_from_dict(
         monkeypatch,
-        {**docker_compose_service_environment_dict},
+        {
+            **docker_compose_service_environment_dict,
+            "CATALOG_TRACING": "null",
+        },
     )
 
 

services/clusters-keeper/tests/unit/conftest.py

@@ -119,6 +119,7 @@ def app_environment(
     envs = setenvs_from_dict(
         monkeypatch,
         {
+            "CLUSTERS_KEEPER_TRACING": "null",
             "CLUSTERS_KEEPER_EC2_ACCESS": "{}",
             "CLUSTERS_KEEPER_EC2_ACCESS_KEY_ID": faker.pystr(),
             "CLUSTERS_KEEPER_EC2_SECRET_ACCESS_KEY": faker.pystr(),

services/datcore-adapter/tests/unit/conftest.py

@@ -15,13 +15,15 @@
 from asgi_lifespan import LifespanManager
 from fastapi.applications import FastAPI
 from pytest_mock import MockFixture
+from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 from simcore_service_datcore_adapter.modules.pennsieve import (
     PennsieveAuthorizationHeaders,
 )
 from starlette import status
 from starlette.testclient import TestClient
 
 pytest_plugins = [
+    "pytest_simcore.environment_configs",
     "pytest_simcore.repository_paths",
     "pytest_simcore.pytest_global_environs",
 ]
@@ -74,9 +76,16 @@ def client(minimal_app: FastAPI) -> TestClient:
 
 
 @pytest.fixture
-def app_envs(monkeypatch: pytest.MonkeyPatch):
-    # disable tracing as together with LifespanManager, it does not remove itself nicely
-    ...
+def app_envs(
+    mock_env_devel_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
+) -> EnvVarsDict:
+    return setenvs_from_dict(
+        monkeypatch,
+        {
+            **mock_env_devel_environment,
+            "DATCORE_ADAPTER_TRACING": "null",
+        },
+    )
 
 
 @pytest.fixture()

services/director-v2/tests/conftest.py

@@ -190,6 +190,7 @@ def mock_env(
             "SIMCORE_SERVICES_NETWORK_NAME": "test_network_name",
             "SWARM_STACK_NAME": "pytest-simcore",
             "TRAEFIK_SIMCORE_ZONE": "test_traefik_zone",
+            "DIRECTOR_V2_TRACING": "null",
         },
     )
 

services/docker-compose.yml

@@ -42,6 +42,7 @@ services:
       WEBSERVER_HOST: ${WB_API_WEBSERVER_HOST}
       WEBSERVER_PORT: ${WB_API_WEBSERVER_PORT}
       WEBSERVER_SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
+      API_SERVER_TRACING: ${API_SERVER_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
@@ -127,6 +128,7 @@ services:
       REGISTRY_URL: ${REGISTRY_URL}
       REGISTRY_SSL: ${REGISTRY_SSL}
       REGISTRY_AUTH: ${REGISTRY_AUTH}
+      AUTOSCALING_TRACING: ${AUTOSCALING_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
     volumes:
@@ -168,6 +170,7 @@ services:
       RABBIT_PORT: ${RABBIT_PORT}
       RABBIT_SECURE: ${RABBIT_SECURE}
       RABBIT_USER: ${RABBIT_USER}
+      CATALOG_TRACING: ${CATALOG_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
     networks:
@@ -236,6 +239,7 @@ services:
       WORKERS_EC2_INSTANCES_SECURITY_GROUP_IDS: ${WORKERS_EC2_INSTANCES_SECURITY_GROUP_IDS}
       WORKERS_EC2_INSTANCES_SUBNET_ID: ${WORKERS_EC2_INSTANCES_SUBNET_ID}
       WORKERS_EC2_INSTANCES_CUSTOM_TAGS: ${WORKERS_EC2_INSTANCES_CUSTOM_TAGS}
+      CLUSTERS_KEEPER_TRACING: ${CLUSTERS_KEEPER_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
     secrets: *dask_tls_secrets
@@ -278,6 +282,7 @@ services:
       SIMCORE_SERVICES_NETWORK_NAME: interactive_services_subnet
       STORAGE_ENDPOINT: ${STORAGE_ENDPOINT}
       SWARM_STACK_NAME: ${SWARM_STACK_NAME:-simcore}
+      DIRECTOR_TRACING: ${DIRECTOR_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE: ${TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE}
       TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT}
       TRAEFIK_SIMCORE_ZONE: ${TRAEFIK_SIMCORE_ZONE:-internal_simcore_stack}
@@ -383,6 +388,7 @@ services:
       SIMCORE_SERVICES_NETWORK_NAME: ${SIMCORE_SERVICES_NETWORK_NAME}
       SWARM_STACK_NAME: ${SWARM_STACK_NAME}
       TRAEFIK_SIMCORE_ZONE: ${TRAEFIK_SIMCORE_ZONE}
+      DIRECTOR_V2_TRACING: ${DIRECTOR_V2_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
@@ -434,6 +440,7 @@ services:
       EFS_MOUNTED_PATH: ${EFS_MOUNTED_PATH}
       EFS_ONLY_ENABLED_FOR_USERIDS: ${EFS_ONLY_ENABLED_FOR_USERIDS}
       EFS_PROJECT_SPECIFIC_DATA_DIRECTORY: ${EFS_PROJECT_SPECIFIC_DATA_DIRECTORY}
+      EFS_GUARDIAN_TRACING: ${EFS_GUARDIAN_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
   invitations:
@@ -452,6 +459,7 @@ services:
       INVITATIONS_USERNAME: ${INVITATIONS_USERNAME}
       LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
       LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
+      INVITATIONS_TRACING: ${INVITATIONS_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
   payments:
@@ -496,6 +504,7 @@ services:
       SMTP_PORT: ${SMTP_PORT}
       SMTP_PROTOCOL: ${SMTP_PROTOCOL}
       SMTP_USERNAME: ${SMTP_USERNAME}
+      PAYMENTS_TRACING: ${PAYMENTS_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
 
@@ -532,6 +541,7 @@ services:
       RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC}
       RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL}
       RESOURCE_USAGE_TRACKER_S3: ${RESOURCE_USAGE_TRACKER_S3}
+      RESOURCE_USAGE_TRACKER_TRACING: ${RESOURCE_USAGE_TRACKER_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
       RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_PORT}
@@ -560,6 +570,7 @@ services:
       DYNAMIC_SCHEDULER_LOGLEVEL: ${DYNAMIC_SCHEDULER_LOGLEVEL}
       DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT: ${DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT}
       DYNAMIC_SCHEDULER_PROFILING: ${DYNAMIC_SCHEDULER_PROFILING}
+      DYNAMIC_SCHEDULER_TRACING: ${DYNAMIC_SCHEDULER_TRACING}
       TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
       TRACING_OPENTELEMETRY_COLLECTOR_PORT: ${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
   static-webserver:

services/dynamic-scheduler/tests/conftest.py

@@ -74,7 +74,10 @@ def app_environment(
 ) -> EnvVarsDict:
     return setenvs_from_dict(
         monkeypatch,
-        {**docker_compose_service_dynamic_scheduler_env_vars},
+        {
+            **docker_compose_service_dynamic_scheduler_env_vars,
+            "DYNAMIC_SCHEDULER_TRACING": "null",
+        },
     )