diff --git a/packages/celery-library/tests/unit/test_tasks.py b/packages/celery-library/tests/unit/test_tasks.py index 757cbd3aaff2..98e748550503 100644 --- a/packages/celery-library/tests/unit/test_tasks.py +++ b/packages/celery-library/tests/unit/test_tasks.py @@ -16,7 +16,7 @@ from celery_library.errors import TaskNotFoundError, TransferrableCeleryError from celery_library.task import register_task from celery_library.task_manager import CeleryTaskManager -from celery_library.utils import get_app_server +from celery_library.worker.app_server import get_app_server from common_library.errors_classes import OsparcErrorMixin from faker import Faker from models_library.progress_bar import ProgressReport diff --git a/services/api-server/src/simcore_service_api_server/modules/celery/worker/main.py b/services/api-server/src/simcore_service_api_server/modules/celery/worker/main.py index 826802f4d34b..94a3ee806e47 100644 --- a/services/api-server/src/simcore_service_api_server/modules/celery/worker/main.py +++ b/services/api-server/src/simcore_service_api_server/modules/celery/worker/main.py @@ -1,31 +1,25 @@ from celery_library.worker.app import create_worker_app from servicelib.fastapi.celery.app_server import FastAPIAppServer from servicelib.logging_utils import setup_loggers -from servicelib.tracing import TracingConfig from ....core.application import create_app from ....core.settings import ApplicationSettings from .tasks import register_worker_tasks -_settings = ApplicationSettings.create_from_envs() -_tracing_settings = _settings.API_SERVER_TRACING -_tracing_config = TracingConfig.create( - tracing_settings=_tracing_settings, - service_name="api-server-celery-worker", -) - def get_app(): + _settings = ApplicationSettings.create_from_envs() + setup_loggers( log_format_local_dev_enabled=_settings.API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED, logger_filter_mapping=_settings.API_SERVER_LOG_FILTER_MAPPING, - tracing_config=_tracing_config, + tracing_settings=_settings.API_SERVER_TRACING, log_base_level=_settings.log_level, noisy_loggers=None, ) def _app_server_factory() -> FastAPIAppServer: - fastapi_app = create_app(_settings, tracing_config=_tracing_config) + fastapi_app = create_app(_settings) return FastAPIAppServer(app=fastapi_app) assert _settings.API_SERVER_CELERY # nosec diff --git a/services/api-server/tests/unit/api_functions/celery/conftest.py b/services/api-server/tests/unit/api_functions/celery/conftest.py index bdb23dc68206..264b63b95601 100644 --- a/services/api-server/tests/unit/api_functions/celery/conftest.py +++ b/services/api-server/tests/unit/api_functions/celery/conftest.py @@ -20,7 +20,6 @@ from pytest_simcore.helpers.monkeypatch_envs import delenvs_from_dict, setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict from servicelib.fastapi.celery.app_server import FastAPIAppServer -from servicelib.tracing import TracingConfig from settings_library.redis import RedisSettings from simcore_service_api_server.clients import celery_task_manager from simcore_service_api_server.core.application import create_app @@ -114,15 +113,11 @@ async def with_api_server_celery_worker( add_worker_tasks: bool, monkeypatch: pytest.MonkeyPatch, ) -> AsyncIterator[TestWorkController]: - tracing_config = TracingConfig.create( - tracing_settings=None, # disable tracing in tests - service_name="api-server-worker-test", - ) # Signals must be explicitily connected monkeypatch.setenv("API_SERVER_WORKER_MODE", "true") app_settings = ApplicationSettings.create_from_envs() - app_server = FastAPIAppServer(app=create_app(app_settings, tracing_config)) + app_server = FastAPIAppServer(app=create_app(app_settings)) _init_wrapper = _worker_init_wrapper(celery_app, lambda: app_server) _shutdown_wrapper = _worker_shutdown_wrapper(celery_app) diff --git a/services/storage/src/simcore_service_storage/modules/celery/worker/main.py b/services/storage/src/simcore_service_storage/modules/celery/worker/main.py index e6a455209706..3a77118c766e 100644 --- a/services/storage/src/simcore_service_storage/modules/celery/worker/main.py +++ b/services/storage/src/simcore_service_storage/modules/celery/worker/main.py @@ -1,7 +1,6 @@ from celery_library.worker.app import create_worker_app from servicelib.fastapi.celery.app_server import FastAPIAppServer from servicelib.logging_utils import setup_loggers -from servicelib.tracing import TracingConfig from ....api._worker_tasks.tasks import register_worker_tasks from ....core.application import create_app @@ -10,21 +9,17 @@ def get_app(): _settings = ApplicationSettings.create_from_envs() - _tracing_config = TracingConfig.create( - tracing_settings=_settings.STORAGE_TRACING, - service_name="storage-celery-worker", - ) setup_loggers( log_format_local_dev_enabled=_settings.STORAGE_LOG_FORMAT_LOCAL_DEV_ENABLED, logger_filter_mapping=_settings.STORAGE_LOG_FILTER_MAPPING, - tracing_config=_tracing_config, + tracing_settings=_settings.STORAGE_TRACING, log_base_level=_settings.log_level, noisy_loggers=None, ) def _app_server_factory() -> FastAPIAppServer: - fastapi_app = create_app(_settings, tracing_config=_tracing_config) + fastapi_app = create_app(_settings) return FastAPIAppServer(app=fastapi_app) assert _settings.STORAGE_CELERY # nosec