Update e2e tests

DataDog · Feb 5, 2021 · 90797cc · 90797cc
1 parent 8010bec
commit 90797cc
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 5 deletions.
diff --git a/activemq/tests/common.py b/activemq/tests/common.py
@@ -1,10 +1,20 @@
 # (C) Datadog, Inc. 2019-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
+import os
+
+import pytest
+
 from datadog_checks.dev import get_docker_hostname, get_here
 
 CHECK_NAME = 'activemq'
 
+COMPOSE_FILE = os.getenv('COMPOSE_FILE')
+IS_ARTEMIS = COMPOSE_FILE == 'artemis.yaml'
+
+artemis = pytest.mark.skipif(not IS_ARTEMIS, reason='Test only valid for ActiveMQ Artemis versions')
+not_artemis = pytest.mark.skipif(IS_ARTEMIS, reason='Test only valid for non-Artemis versions')
+
 HERE = get_here()
 HOST = get_docker_hostname()
 
@@ -39,3 +49,20 @@
     "activemq.broker.temp_pct",
     "activemq.broker.memory_pct",
 ]
+
+ARTEMIS_E2E_METRICS = [
+    "activemq.artemis.connection_count",
+    "activemq.artemis.max_disk_usage",
+    "activemq.artemis.queue.consumer_count",
+    "activemq.artemis.queue.max_consumers",
+    "activemq.artemis.queue.message_count",
+    "activemq.artemis.queue.messages_acknowledged",
+    "activemq.artemis.queue.messages_added",
+    "activemq.artemis.queue.messages_expired",
+    "activemq.artemis.queue.messages_killed",
+    "activemq.artemis.total_connection_count",
+    "activemq.artemis.total_consumer_count",
+    "activemq.artemis.total_message_count",
+    "activemq.artemis.total_messages_acknowledged",
+    "activemq.artemis.total_messages_added",
+]
diff --git a/activemq/tests/conftest.py b/activemq/tests/conftest.py
@@ -16,8 +16,10 @@
     ACTIVEMQ_URL,
     ARTEMIS_URL,
     BASE_URL,
+    COMPOSE_FILE,
     HERE,
     HOST,
+    IS_ARTEMIS,
     JMX_PORT,
     TEST_AUTH,
     TEST_MESSAGE,
@@ -26,9 +28,6 @@
     TEST_TOPICS,
 )
 
-COMPOSE_FILE = os.getenv('COMPOSE_FILE')
-IS_ARTEMIS = COMPOSE_FILE == 'artemis.yaml'
-
 
 def populate_server():
     """Add some queues and topics to ensure more metrics are available."""

diff --git a/activemq/tests/test_check.py b/activemq/tests/test_check.py
@@ -7,11 +7,12 @@
 from datadog_checks.dev.jmx import JVM_E2E_METRICS
 from datadog_checks.dev.utils import get_metadata_metrics
 
-from .common import ACTIVEMQ_E2E_METRICS
+from .common import ACTIVEMQ_E2E_METRICS, ARTEMIS_E2E_METRICS, artemis, not_artemis
 
 
+@not_artemis
 @pytest.mark.e2e
-def test(dd_agent_check):
+def test_activemq_metrics(dd_agent_check):
     instance = {}
     aggregator = dd_agent_check(instance)
 
@@ -20,3 +21,16 @@ def test(dd_agent_check):
 
     aggregator.assert_all_metrics_covered()
     aggregator.assert_metrics_using_metadata(get_metadata_metrics(), exclude=JVM_E2E_METRICS)
+
+
+@artemis
+@pytest.mark.e2e
+def test_artemis_metrics(dd_agent_check):
+    instance = {}
+    aggregator = dd_agent_check(instance)
+
+    for metric in ARTEMIS_E2E_METRICS + JVM_E2E_METRICS:
+        aggregator.assert_metric(metric)
+
+    aggregator.assert_all_metrics_covered()
+    aggregator.assert_metrics_using_metadata(get_metadata_metrics(), exclude=JVM_E2E_METRICS)