Move monitor.py to common/monitor.py

module_build_service/common/messaging.py

@@ -25,7 +25,7 @@ def publish(topic, msg, conf, service):
             "No messaging backend found for %r in %r" % (conf.messaging, _messaging_backends.keys())
         )
 
-    from module_build_service.monitor import (
+    from module_build_service.common.monitor import (
         messaging_tx_to_send_counter,
         messaging_tx_sent_ok_counter,
         messaging_tx_failed_counter,

module_build_service/scheduler/consumer.py

@@ -20,8 +20,7 @@ import moksha.hub
 import sqlalchemy.exc
 
 import module_build_service.common.messaging
-import module_build_service.monitor as monitor
-
+import module_build_service.common.monitor as monitor
 from module_build_service import models, log, conf
 from module_build_service.scheduler.db_session import db_session
 from module_build_service.errors import IgnoreMessage

module_build_service/scheduler/db_session.py

@@ -19,7 +19,7 @@ def _setup_event_listeners(db_session):
         sqlalchemy.event.listen(db_session, "before_commit", session_before_commit_handlers)
 
     # initialize DB event listeners from the monitor module
-    from module_build_service.monitor import db_hook_event_listeners
+    from module_build_service.common.monitor import db_hook_event_listeners
 
     db_hook_event_listeners(db_session.bind.engine)
 

module_build_service/views.py

@@ -15,7 +15,7 @@ from module_build_service import app, conf, log, models, db, version, api_versio
 from module_build_service.common.utils import import_mmd
 from module_build_service.errors import ValidationError, Forbidden, NotFound, ProgrammingError
 from module_build_service.web.backports import jsonify
-from module_build_service.monitor import registry
+from module_build_service.common.monitor import registry
 from module_build_service.common.submit import fetch_mmd
 import module_build_service.web.auth
 from module_build_service.web.submit import (

tests/test_common/test_monitor.py

@@ -7,7 +7,7 @@ import requests
 import mock
 from six.moves import reload_module
 
-import module_build_service.monitor
+import module_build_service.common.monitor
 from module_build_service import app, conf, models
 from module_build_service.scheduler.db_session import db_session
 from tests import init_data, make_module_in_db
@@ -37,7 +37,7 @@ def test_standalone_metrics_server_disabled_by_default():
 
 def test_standalone_metrics_server():
     os.environ["MONITOR_STANDALONE_METRICS_SERVER_ENABLE"] = "true"
-    reload_module(module_build_service.monitor)
+    reload_module(module_build_service.common.monitor)
 
     r = requests.get("http://127.0.0.1:10040/metrics")
     count = len([
@@ -47,8 +47,8 @@ def test_standalone_metrics_server():
     assert count == num_of_metrics
 
 
-@mock.patch("module_build_service.monitor.builder_failed_counter.labels")
-@mock.patch("module_build_service.monitor.builder_success_counter.inc")
+@mock.patch("module_build_service.common.monitor.builder_failed_counter.labels")
+@mock.patch("module_build_service.common.monitor.builder_success_counter.inc")
 def test_monitor_state_changing_success(succ_cnt, failed_cnt):
     b = make_module_in_db(
         "pkg:0.1:1:c1",
@@ -67,8 +67,8 @@ def test_monitor_state_changing_success(succ_cnt, failed_cnt):
     failed_cnt.assert_not_called()
 
 
-@mock.patch("module_build_service.monitor.builder_failed_counter.labels")
-@mock.patch("module_build_service.monitor.builder_success_counter.inc")
+@mock.patch("module_build_service.common.monitor.builder_failed_counter.labels")
+@mock.patch("module_build_service.common.monitor.builder_success_counter.inc")
 def test_monitor_state_changing_failure(succ_cnt, failed_cnt):
     failure_type = "user"
     b = make_module_in_db(