From 47639ed4a73d6aeac10c25e1a8d8c8e0078ba747 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 13 Feb 2025 12:56:01 -0600 Subject: [PATCH 1/3] feat(logs): make celery logs structured --- warehouse/logging.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/warehouse/logging.py b/warehouse/logging.py index bb63bc4ee6f8..a186ae397ce0 100644 --- a/warehouse/logging.py +++ b/warehouse/logging.py @@ -83,6 +83,21 @@ def includeme(config): "handlers": ["primary"], "level": config.registry.settings.get("logging.level", "INFO"), }, + "celery": { + "propagate": False, + "handlers": ["primary"], + "level": config.registry.settings.get("logging.level", "INFO"), + }, + "celery.task": { + "propagate": False, + "handlers": ["primary"], + "level": config.registry.settings.get("logging.level", "INFO"), + }, + "celery.worker": { + "propagate": False, + "handlers": ["primary"], + "level": config.registry.settings.get("logging.level", "INFO"), + }, }, "root": { "level": config.registry.settings.get("logging.level", "INFO"), From f1248eaff8b8d0517571b9aa5f28214440153cd7 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 13 Feb 2025 12:59:32 -0600 Subject: [PATCH 2/3] fix: add missing logger for app trace logs --- warehouse/logging.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/warehouse/logging.py b/warehouse/logging.py index a186ae397ce0..cbd79659f04c 100644 --- a/warehouse/logging.py +++ b/warehouse/logging.py @@ -98,6 +98,11 @@ def includeme(config): "handlers": ["primary"], "level": config.registry.settings.get("logging.level", "INFO"), }, + "celery.app.trace": { + "propagate": False, + "handlers": ["primary"], + "level": config.registry.settings.get("logging.level", "INFO"), + }, }, "root": { "level": config.registry.settings.get("logging.level", "INFO"), From c6ff14ce8c2139cb0488740709ada0b6b57e178c Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Thu, 13 Feb 2025 13:04:56 -0600 Subject: [PATCH 3/3] tests: adjust logging tests --- tests/unit/test_logging.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py index a0e50d0c2f87..de7a4208d747 100644 --- a/tests/unit/test_logging.py +++ b/tests/unit/test_logging.py @@ -118,6 +118,26 @@ def test_includeme(monkeypatch, settings, expected_level): "handlers": ["primary"], "level": expected_level, }, + "celery": { + "propagate": False, + "handlers": ["primary"], + "level": expected_level, + }, + "celery.task": { + "propagate": False, + "handlers": ["primary"], + "level": expected_level, + }, + "celery.worker": { + "propagate": False, + "handlers": ["primary"], + "level": expected_level, + }, + "celery.app.trace": { + "propagate": False, + "handlers": ["primary"], + "level": expected_level, + }, }, "root": {"level": expected_level, "handlers": ["primary"]}, }