Add MySQL 8.0.18 tests (DataDog#22583)

* Add MariaDB 10.4 and MySQL 8.0.18 tests

* Clean

* Lint

* Clean

* Remove MariaDB 10.4

Author: sethsamuel

.github/workflows/test-all.yml

@@ -2654,6 +2654,7 @@ jobs:
       matrix:
         target-env:
         - py3.13-5.7
+        - py3.13-8.0.18
         - py3.13-8.0.36
         - py3.13-8.4.0
         - py3.13-8.0-group

mysql/hatch.toml

@@ -19,6 +19,7 @@ mypy-deps = [
 python = ["3.13"]
 version = [
   "5.7",  # EOL October 21, 2023
+  "8.0.18", # Test for pre-json aggregation version
   "8.0.36",  # EOL April, 2026
   "8.4.0",
 ]
@@ -53,7 +54,7 @@ version = [
 
 [envs.default.overrides]
 matrix.version.env-vars = [
-  { key = "COMPOSE_FILE", value = "mysql8.yaml", if = ["8.0.36"] },
+  { key = "COMPOSE_FILE", value = "mysql8.yaml", if = ["8.0.18", "8.0.36"] },
   { key = "COMPOSE_FILE", value = "mysql8.yaml", if = ["8.4.0"] },
 ]
 name."8.0-group".env-vars = [

mysql/tests/conftest.py

@@ -12,6 +12,7 @@
 
 from datadog_checks.dev import TempDir, WaitFor, docker_run
 from datadog_checks.dev.conditions import CheckDockerLogs
+from datadog_checks.mysql.version_utils import parse_version as parse_mysql_version
 
 from . import common, tags
 from .common import MYSQL_REPLICATION, MYSQL_VERSION_PARSED
@@ -323,7 +324,10 @@ def version_metadata():
         'version.raw': mock.ANY,
         'version.build': mock.ANY,
         'flavor': flavor,
-        'resolved_hostname': 'forced_hostname',
+        # Hostname resolution varies by environment but should always be a non-empty string
+        # CI might use 'forced_hostname', local might use 'stubbed.hostname' or actual hostname
+        # The actual value is tested separately in test_database_identifier and other tests
+        'resolved_hostname': mock.ANY,
     }
 
 
@@ -495,14 +499,19 @@ def init_master():
     _init_datadog_sample_collection(conn)
 
 
-@pytest.fixture
-def root_conn():
-    conn = pymysql.connect(
+def _get_root_connection():
+    """Create a root connection to MySQL. Caller is responsible for closing."""
+    return pymysql.connect(
         host=common.HOST,
         port=common.PORT,
         user='root',
         password='mypass' if MYSQL_FLAVOR == 'percona' or MYSQL_REPLICATION in ('group', 'hybrid') else None,
     )
+
+
+@pytest.fixture
+def root_conn():
+    conn = _get_root_connection()
     yield conn
     conn.close()
 
@@ -530,7 +539,10 @@ def _add_dog_user(conn):
     # need to get better exception in order to raise errors in the future
     except Exception:
         if MYSQL_FLAVOR == 'mariadb':
-            cur.execute("GRANT SLAVE MONITOR ON *.* TO 'dog'@'%'")
+            if MYSQL_VERSION_PARSED >= parse_version('10.5.0'):
+                cur.execute("GRANT SLAVE MONITOR ON *.* TO 'dog'@'%'")
+            else:
+                cur.execute("GRANT REPLICATION CLIENT ON *.* TO 'dog'@'%'")
         cur.execute("ALTER USER 'dog'@'%' WITH MAX_USER_CONNECTIONS 0")
 
 
@@ -733,3 +745,46 @@ def _mysql_docker_repo():
         return 'percona/percona-server'
     else:
         raise ValueError('Unsupported MySQL flavor: {}'.format(MYSQL_FLAVOR))
+
+
+# Runtime version detection fixtures
+
+# Well-known MySQL/MariaDB version thresholds
+JSON_AGGREGATION_MYSQL = (8, 0, 19)
+JSON_AGGREGATION_MARIADB = (10, 5, 0)
+
+
+@pytest.fixture(scope='session')
+def mysql_version(dd_environment):
+    """
+    Query the actual MySQL/MariaDB version from the running database.
+
+    Returns the MySQLVersion object from version_utils with:
+        - version: string like "8.0.32"
+        - flavor: "MySQL", "MariaDB", or "Percona"
+        - build: build info
+        - version_compatible(tuple): method to check version >= tuple
+
+    Usage:
+        def test_my_feature(mysql_version):
+            if mysql_version.version_compatible((8, 0, 19)):
+                # MySQL 8.0.19+ specific code
+    """
+    conn = _get_root_connection()
+    try:
+        with conn.cursor() as cursor:
+            cursor.execute("SELECT @@version, @@version_comment")
+            version_str, version_comment = cursor.fetchone()
+
+        mysql_ver = parse_mysql_version(version_str, version_comment)
+        logger.info("Detected runtime MySQL version: %s %s", mysql_ver.flavor, mysql_ver.version)
+        return mysql_ver
+    finally:
+        conn.close()
+
+
+def _supports_json_aggregation(mysql_version):
+    """Check if the MySQL/MariaDB version supports JSON aggregation functions."""
+    if mysql_version.flavor.lower() == 'mariadb':
+        return mysql_version.version_compatible(JSON_AGGREGATION_MARIADB)
+    return mysql_version.version_compatible(JSON_AGGREGATION_MYSQL)

mysql/tests/test_statements.py

@@ -202,6 +202,9 @@ def _obfuscate_sql(query, options=None):
 def test_statement_metrics_prepared_statements(
     aggregator, dd_run_check, dbm_instance, bob_conn, collect_prepared_statements
 ):
+    if MYSQL_FLAVOR == 'mariadb' and MYSQL_VERSION_PARSED < parse_version('10.5.0'):
+        pytest.skip("prepared_statements_instances is unavailable on MariaDB < 10.5")
+
     dbm_instance['query_metrics']['only_query_recent_statements'] = False
     dbm_instance['query_metrics']['collect_prepared_statements'] = collect_prepared_statements
     mysql_check = MySql(common.CHECK_NAME, {}, [dbm_instance])