Merge branch 'master' into alex/hive_use_config_spec

hive/tests/common.py

@@ -7,3 +7,6 @@
 
 HERE = get_here()
 HOST = get_docker_hostname()
+
+METASTORE_PORT = 8808
+SERVER_PORT = 8809

hive/tests/conftest.py

@@ -7,19 +7,27 @@
 import pytest
 
 from datadog_checks.dev import docker_run
+from datadog_checks.dev.conditions import CheckDockerLogs
 from datadog_checks.dev.utils import load_jmx_config
 
-from .common import HERE
+from .common import HERE, HOST, METASTORE_PORT, SERVER_PORT
 
 
 @pytest.fixture(scope="session")
 def dd_environment():
+    compose_file = os.path.join(HERE, 'compose', 'docker-compose.yaml')
     with docker_run(
-        os.path.join(HERE, 'compose', 'docker-compose.yaml'),
-        log_patterns=[r'datanode:\(\d+\) is available', 'Starting Hive Metastore Server', 'Starting HiveServer2'],
-        sleep=2,
+        compose_file,
+        conditions=[
+            CheckDockerLogs(
+                compose_file,
+                [r'datanode:\d+ is available', 'Starting Hive Metastore Server', 'Starting HiveServer2'],
+                matches='all',
+            )
+        ],
     ):
-        instance = {'host': 'localhost', 'port': 8809}
+        instance_metastore = {'host': HOST, 'port': METASTORE_PORT}
+        instance_server = {'host': HOST, 'port': SERVER_PORT}
         config = load_jmx_config()
-        config['instances'] = [instance]
+        config['instances'] = [instance_metastore, instance_server]
         yield config, {'use_jmx': True}

hive/tests/test_check.py

@@ -1,14 +1,12 @@
 # (C) Datadog, Inc. 2019-present
 # All rights reserved
 # Licensed under Simplified BSD License (see LICENSE)
-
 import pytest
 
 
 @pytest.mark.e2e
 def test(dd_agent_check):
-    instance = {}
-    aggregator = dd_agent_check(instance)
+    aggregator = dd_agent_check()
     metrics = [
         "hive.server.memory.heap.committed",
         "hive.server.memory.heap.init",
@@ -24,6 +22,12 @@ def test(dd_agent_check):
         "hive.server.memory.total.used",
         "hive.server.session.active",
         "hive.server.session.open",
+        "hive.metastore.api.get_all_tables.active_call",
+        "hive.metastore.api.get_all_functions.active_call",
+        "hive.metastore.open_connections",
+        "hive.metastore.partition.init",
+        "hive.metastore.api.get_all_databases.active_call",
+        "hive.metastore.api.init.active_call",
     ]
     for metric in metrics:
         aggregator.assert_metric(metric)

kafka/datadog_checks/kafka/data/conf.yaml.example

@@ -616,7 +616,7 @@ init_config:
         attribute:
           Value:
             metric_type: gauge
-            alias: kafka.net.handler.avg.idle.pct.rate
+            alias: kafka.net.processor.avg.idle.pct.rate
     - include:
         domain: 'kafka.server'
         bean: 'kafka.server:type=KafkaRequestHandlerPool,name=RequestHandlerAvgIdlePercent'

kafka/tests/common.py

@@ -35,7 +35,7 @@
 """
 
 KAFKA_E2E_METRICS = [
-    "kafka.net.handler.avg.idle.pct.rate",
+    "kafka.net.processor.avg.idle.pct.rate",
     # Request metrics:
     "kafka.request.channel.queue.size",
     "kafka.request.fetch_consumer.time.99percentile",

kafka/tests/conftest.py

@@ -6,12 +6,17 @@
 import pytest
 
 from datadog_checks.dev import docker_run
+from datadog_checks.dev.conditions import CheckDockerLogs
 from datadog_checks.dev.utils import load_jmx_config
 
 from .common import HERE
 
 
 @pytest.fixture(scope='session')
 def dd_environment():
-    with docker_run(os.path.join(HERE, 'compose', 'docker-compose.yml')):
+    compose_file = os.path.join(HERE, 'compose', 'docker-compose.yml')
+
+    with docker_run(
+        compose_file, conditions=[CheckDockerLogs(compose_file, [r'\[KafkaServer id=\d+\] started'], matches="all")]
+    ):
         yield load_jmx_config(), {'use_jmx': True}