Scope uuid queue & exchange to session

Author: hmstepanek

tests/messagebroker_kombu/conftest.py

@@ -17,8 +17,8 @@
 import uuid
 
 import kombu
-from amqp.exceptions import NotFound
 import pytest
+from amqp.exceptions import NotFound
 from kombu import messaging, serialization
 from testing_support.db_settings import rabbitmq_settings
 from testing_support.fixtures import (  # noqa: F401; pylint: disable=W0611
@@ -34,12 +34,7 @@
 DB_SETTINGS = rabbitmq_settings()[0]
 
 
-@pytest.fixture(
-    scope="session",
-    params=[
-        "pyamqp"  # , "amqp", #"qpid", "redis"
-    ],
-)
+@pytest.fixture(scope="session", params=["pyamqp"])
 def transport_type(request):
     return request.param
 
@@ -75,11 +70,11 @@ def consumer_connection(transport_type):
 
 
 @pytest.fixture(scope="function")
-def producer(producer_connection):
+def producer(producer_connection, queue):
+    # Purge the queue.
     try:
-        # Purge the queue.
         channel = producer_connection.channel()
-        channel.queue_purge("bar")
+        channel.queue_purge(queue.name)
     except NotFound:  # This can happen if the queue is not found.
         pass
 
@@ -153,14 +148,16 @@ def events():
     return []
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def exchange():
-    return kombu.Exchange("exchange", "direct", durable=True)
+    exchange_uuid = str(uuid.uuid4())
+    return kombu.Exchange(f"exchange-{exchange_uuid}", "direct", durable=True)
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def queue(exchange):
-    return kombu.Queue("bar", exchange=exchange, routing_key="bar")
+    queue_uuid = str(uuid.uuid4())
+    return kombu.Queue(f"queue-{queue_uuid}", exchange=exchange, routing_key="bar")
 
 
 @pytest.fixture

tests/messagebroker_kombu/test_consumer.py

@@ -27,14 +27,14 @@
 from newrelic.common.package_version_utils import get_package_version
 
 
-def test_custom_metrics(get_consumer_record, events):
+def test_custom_metrics(get_consumer_record, events, exchange):
     @validate_transaction_metrics(
-        "Named/exchange",
+        f"Named/{exchange.name}",
         group="Message/Kombu/Exchange",
         custom_metrics=[
-            ("Message/Kombu/Exchange/Named/exchange/Received/Bytes", 1),
-            ("Message/Kombu/Exchange/Named/exchange/Received/Messages", 1),
-            ("MessageBroker/Kombu/Exchange/Named/exchange/Serialization/Value", 1),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Bytes", 1),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Messages", 1),
+            (f"MessageBroker/Kombu/Exchange/Named/{exchange.name}/Serialization/Value", 1),
         ],
         background_task=True,
     )
@@ -60,16 +60,16 @@ def test_multiple_transactions(get_consumer_record):
     get_consumer_record()
 
 
-def test_custom_metrics_on_existing_transaction(get_consumer_record):
+def test_custom_metrics_on_existing_transaction(get_consumer_record, exchange):
     version = get_package_version("kombu")
 
     @validate_transaction_metrics(
         "test_consumer:test_custom_metrics_on_existing_transaction.<locals>._test",
         custom_metrics=[
-            ("Message/Kombu/Exchange/Named/exchange/Received/Bytes", 1),
-            ("Message/Kombu/Exchange/Named/exchange/Received/Messages", 1),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Bytes", 1),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Messages", 1),
             (f"Python/MessageBroker/Kombu/{version}", 1),
-            ("MessageBroker/Kombu/Exchange/Named/exchange/Serialization/Value", 1),
+            (f"MessageBroker/Kombu/Exchange/Named/{exchange.name}/Serialization/Value", 1),
             ("MessageBroker/Kombu/Exchange/Named/Unknown/Serialization/Value", 1),
         ],
         background_task=True,
@@ -82,12 +82,12 @@ def _test():
     _test()
 
 
-def test_custom_metrics_inactive_transaction(get_consumer_record):  # , expected_missing_broker_metrics):
+def test_custom_metrics_inactive_transaction(get_consumer_record, exchange):
     @validate_transaction_metrics(
         "test_consumer:test_custom_metrics_inactive_transaction.<locals>._test",
         custom_metrics=[
-            ("Message/Kombu/Exchange/Named/exchange/Received/Bytes", None),
-            ("Message/Kombu/Exchange/Named/exchange/Received/Messages", None),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Bytes", None),
+            (f"Message/Kombu/Exchange/Named/{exchange.name}/Received/Messages", None),
         ],
         # + expected_missing_broker_metrics,
         background_task=True,
@@ -123,14 +123,14 @@ def _test():
     _test()
 
 
-def test_distributed_tracing_headers(send_producer_message, consumer_connection, consumer_validate_dt):
+def test_distributed_tracing_headers(send_producer_message, consumer_connection, consumer_validate_dt, exchange):
     # Produce the messages inside a transaction, making sure to close it.
     @background_task()
     def _produce():
         send_producer_message()
 
     @validate_transaction_metrics(
-        "Named/exchange",
+        f"Named/{exchange.name}",
         group="Message/Kombu/Exchange",
         rollup_metrics=[
             ("Supportability/DistributedTrace/AcceptPayload/Success", None),

tests/messagebroker_kombu/test_producer.py

@@ -24,12 +24,12 @@
 from newrelic.common.object_names import callable_name
 
 
-def test_trace_metrics(send_producer_message):
+def test_trace_metrics(send_producer_message, exchange):
     import kombu
 
     version = kombu.__version__
 
-    scoped_metrics = [("MessageBroker/Kombu/Exchange/Produce/Named/exchange", 1)]
+    scoped_metrics = [(f"MessageBroker/Kombu/Exchange/Produce/Named/{exchange.name}", 1)]
     unscoped_metrics = scoped_metrics
 
     @validate_transaction_metrics(
@@ -38,7 +38,7 @@ def test_trace_metrics(send_producer_message):
         rollup_metrics=unscoped_metrics,
         custom_metrics=[
             (f"Python/MessageBroker/Kombu/{version}", 1),
-            ("MessageBroker/Kombu/Exchange/Named/exchange/Serialization/Value", 1),
+            (f"MessageBroker/Kombu/Exchange/Named/{exchange.name}/Serialization/Value", 1),
         ],
         background_task=True,
     )