Merge branch 'master' into feature/dont-try-parse-body

Makefile

@@ -7,7 +7,7 @@ setup: install
 	@pip install -r requirements/requirements_test.txt
 
 lint:
-	@flake8 barterdude tests tests_integration
+	@flake8 barterdude tests_unit tests_integration
 
 test:
 	@nosetests -s --exclude="tests_integration" --with-coverage --cover-erase --cover-package=barterdude

barterdude/hooks/metrics/prometheus/definitions.py

@@ -102,7 +102,7 @@ def _prepare_on_connection_fail(
             self, state: str, namespace: str, unit: str):
 
         self.__metrics[state] = Counter(
-                name=f"connection_fail",
+                name="connection_fail",
                 documentation=("Number of times barterdude failed "
                                "to connect to the AMQP broker"),
                 labelnames=self.__labelkeys,

barterdude/message.py

@@ -20,6 +20,10 @@ def body(self):
     def raw(self):
         return self._message.serialized_data
 
+    @property
+    def queue_name(self):
+        return self._message._amqp_message.queue_name
+
     @property
     def properties(self):
         return self._message._amqp_message._properties

tests_integration/test_rabbitmq_integration.py

@@ -114,8 +114,9 @@ async def test_process_messages_successfully_even_with_crashed_hook(self):
         received_messages = set()
 
         monitor = Monitor(ErrorHook())
-        @self.app.consume_amqp([self.input_queue], coroutines=1,
-                               monitor=monitor)
+
+        @self.app.consume_amqp(
+            [self.input_queue], coroutines=1, monitor=monitor)
         async def handler(message):
             nonlocal received_messages
             received_messages.add(message.body["key"])

tests_unit/test_message.py

@@ -12,6 +12,8 @@ def test_should_convert_rabbitmq_message_to_message(self):
         self.assertEqual(message.body, rbmq_message.body)
         self.assertEqual(
             message.properties, rbmq_message._amqp_message._properties)
+        self.assertEqual(
+            message.queue_name, rbmq_message._amqp_message.queue_name)
         self.assertEqual(message.raw, rbmq_message.serialized_data)
 
     async def test_should_call_rbmq_methods(self):