[pull] master from DataDog:master

mysql/changelog.d/23505.added

@@ -0,0 +1 @@
+Add metadata lock blocking detection to activity query for MySQL 8.0+.

mysql/datadog_checks/mysql/activity.py

@@ -89,22 +89,53 @@
 """
 
 BLOCKING_COLUMNS_MYSQL8 = """\
-    ,blocking_thread.thread_id AS blocking_thread_id,
-    blocking_thread.processlist_id AS blocking_processlist_id
+    ,COALESCE(blocking_thread.thread_id, mdl_blocking_thread.thread_id) AS blocking_thread_id,
+    COALESCE(blocking_thread.processlist_id, mdl_blocking_thread.processlist_id) AS blocking_processlist_id,
+    mdl_waiting.OBJECT_TYPE AS mdl_object_type,
+    mdl_waiting.OBJECT_SCHEMA AS mdl_object_schema,
+    mdl_waiting.OBJECT_NAME AS mdl_object_name,
+    mdl_waiting.LOCK_TYPE AS mdl_waiting_lock_type,
+    mdl_blocking.LOCK_TYPE AS mdl_blocking_lock_type
 """
 
 BLOCKING_JOINS_MYSQL8 = """\
-    LEFT JOIN performance_schema.data_lock_waits AS lock_waits ON thread_a.thread_id = lock_waits.requesting_thread_id
-    LEFT JOIN performance_schema.threads AS blocking_thread ON lock_waits.blocking_thread_id = blocking_thread.thread_id
+    LEFT JOIN performance_schema.data_lock_waits AS lock_waits
+        ON thread_a.thread_id = lock_waits.requesting_thread_id
+    LEFT JOIN performance_schema.threads AS blocking_thread
+        ON lock_waits.blocking_thread_id = blocking_thread.thread_id
+    LEFT JOIN performance_schema.metadata_locks AS mdl_waiting
+        ON thread_a.thread_id = mdl_waiting.OWNER_THREAD_ID
+        AND mdl_waiting.LOCK_STATUS = 'PENDING'
+    LEFT JOIN performance_schema.metadata_locks AS mdl_blocking
+        ON mdl_waiting.OBJECT_TYPE = mdl_blocking.OBJECT_TYPE
+        AND mdl_waiting.OBJECT_SCHEMA <=> mdl_blocking.OBJECT_SCHEMA
+        AND mdl_waiting.OBJECT_NAME <=> mdl_blocking.OBJECT_NAME
+        AND mdl_blocking.LOCK_STATUS = 'GRANTED'
+        AND mdl_waiting.OWNER_THREAD_ID != mdl_blocking.OWNER_THREAD_ID
+    LEFT JOIN performance_schema.threads AS mdl_blocking_thread
+        ON mdl_blocking.OWNER_THREAD_ID = mdl_blocking_thread.thread_id
 """
 
 IDLE_BLOCKERS_SUBQUERY_MYSQL8 = """\
         OR
-        -- Include idle sessions that are blocking others
+        -- Include idle sessions that are blocking others via InnoDB data locks
         thread_a.thread_id IN (
             SELECT blocking_thread_id
             FROM performance_schema.data_lock_waits
         )
+        OR
+        -- Include idle sessions that are blocking others via metadata locks
+        thread_a.thread_id IN (
+            SELECT mdl_granted.OWNER_THREAD_ID
+            FROM performance_schema.metadata_locks AS mdl_pending
+            JOIN performance_schema.metadata_locks AS mdl_granted
+                ON mdl_pending.OBJECT_TYPE = mdl_granted.OBJECT_TYPE
+                AND mdl_pending.OBJECT_SCHEMA <=> mdl_granted.OBJECT_SCHEMA
+                AND mdl_pending.OBJECT_NAME <=> mdl_granted.OBJECT_NAME
+                AND mdl_granted.LOCK_STATUS = 'GRANTED'
+                AND mdl_pending.LOCK_STATUS = 'PENDING'
+                AND mdl_pending.OWNER_THREAD_ID != mdl_granted.OWNER_THREAD_ID
+        )
 """
 
 BLOCKING_COLUMNS_MYSQL7 = """\

mysql/tests/test_query_activity.py

@@ -667,6 +667,97 @@ def run_second_deadlock_query(conn, event1, event2):
     )
 
 
+@pytest.mark.skipif(
+    MYSQL_FLAVOR == 'mariadb' or MYSQL_VERSION_PARSED < parse_version('8.0'),
+    reason='MDL blocking detection requires MySQL 8.0+ with metadata_locks instrument enabled by default',
+)
+@pytest.mark.integration
+@pytest.mark.usefixtures('dd_environment')
+def test_mdl_blocking_activity(aggregator, dbm_instance, dd_run_check, root_conn):
+    """Verify that metadata lock contention appears in the activity payload with blocking relationships."""
+    config = deepcopy(dbm_instance)
+    config['query_activity']['collect_blocking_queries'] = True
+    # Disable all metrics that could query information_schema or touch user table
+    # metadata — those queries acquire SHARED_READ metadata locks which would get
+    # queued behind the ALTER TABLE's pending EXCLUSIVE lock, deadlocking the check.
+    config['options'] = {
+        'extra_performance_metrics': False,
+        'replication': False,
+        'extra_status_metrics': False,
+        'extra_innodb_metrics': False,
+        'schema_size_metrics': False,
+        'table_size_metrics': False,
+        'system_table_size_metrics': False,
+        'table_rows_stats_metrics': False,
+    }
+    config['index_metrics'] = {'enabled': False}
+    config['only_custom_queries'] = True
+    check = MySql(CHECK_NAME, {}, instances=[config])
+
+    MDL_TABLE = 'testdb.mdl_test_table'
+
+    with closing(root_conn.cursor()) as cur:
+        # Ensure the consumer is enabled — other tests in this session may disable it.
+        cur.execute("UPDATE performance_schema.setup_consumers SET enabled='YES' WHERE name = 'events_waits_current'")
+        cur.execute('DROP TABLE IF EXISTS {}'.format(MDL_TABLE))
+        cur.execute('CREATE TABLE {} (id INT PRIMARY KEY, val VARCHAR(50))'.format(MDL_TABLE))
+        cur.execute('INSERT INTO {} VALUES (1, %s)'.format(MDL_TABLE), ('hello',))
+    # PyMySQL defaults to autocommit=False, so the DDL/DML above opened an
+    # implicit transaction that holds a SHARED_WRITE metadata lock on the table.
+    # Commit to release it before we set up the intentional MDL contention.
+    root_conn.commit()
+
+    root_password = 'mypass' if MYSQL_FLAVOR == 'percona' or MYSQL_REPLICATION in ('group', 'hybrid') else None
+    holder_conn = pymysql.connect(host=HOST, port=PORT, user='root', password=root_password)
+    ddl_conn = pymysql.connect(host=HOST, port=PORT, user='root', password=root_password)
+    ddl_ready = Event()
+
+    def _hold_shared_mdl(conn):
+        conn.begin()
+        conn.cursor().execute('SELECT * FROM {}'.format(MDL_TABLE))
+
+    def _run_ddl(conn, ready_event):
+        ready_event.set()
+        try:
+            conn.cursor().execute('ALTER TABLE {} ADD COLUMN new_col INT'.format(MDL_TABLE))
+        except Exception:
+            pass
+
+    executor = ThreadPoolExecutor(2)
+    try:
+        executor.submit(_hold_shared_mdl, holder_conn)
+        time.sleep(0.2)
+        executor.submit(_run_ddl, ddl_conn, ddl_ready)
+        ddl_ready.wait(timeout=5)
+        time.sleep(0.5)
+
+        dd_run_check(check)
+
+        dbm_activity = aggregator.get_event_platform_events("dbm-activity")
+        assert dbm_activity, "should have collected at least one activity payload"
+
+        all_rows = [row for event in dbm_activity for row in event['mysql_activity']]
+        mdl_blocked_rows = [r for r in all_rows if r.get('mdl_object_name') == 'mdl_test_table']
+        assert mdl_blocked_rows, "should have at least one activity row with MDL blocking context; all rows: {}".format(
+            [(r.get('sql_text', '?')[:60], r.get('mdl_object_name')) for r in all_rows]
+        )
+
+        mdl_row = mdl_blocked_rows[0]
+        assert mdl_row['mdl_object_type'] == 'TABLE'
+        assert mdl_row['mdl_object_schema'] == 'testdb'
+        assert mdl_row.get('blocking_thread_id'), "MDL blocked row should have a blocking_thread_id"
+    finally:
+        holder_conn.commit()
+        holder_conn.close()
+        # Wait for the ALTER TABLE to complete now that the MDL holder released.
+        # Must shutdown before closing ddl_conn — closing a socket that another
+        # thread is recv()ing on deadlocks on macOS.
+        executor.shutdown(wait=True)
+        ddl_conn.close()
+        with closing(root_conn.cursor()) as cur:
+            cur.execute('DROP TABLE IF EXISTS {}'.format(MDL_TABLE))
+
+
 def _get_conn_for_user(user, _autocommit=False):
     return pymysql.connect(host=HOST, port=PORT, user=user, password=user, autocommit=_autocommit)
 

nifi/README.md

@@ -31,56 +31,6 @@ No additional installation is needed on your server.
 
 3. [Restart the Agent][5].
 
-#### Log collection
-
-1. Collecting logs is disabled by default in the Datadog Agent. Enable it in your `datadog.yaml` file:
-
-   ```yaml
-   logs_enabled: true
-   ```
-
-2. Uncomment and edit the logs configuration block in your `nifi.d/conf.yaml` file. NiFi produces several log files; configure the ones relevant to your environment:
-
-   ```yaml
-   logs:
-     - type: file
-       path: /opt/nifi/logs/nifi-app.log
-       source: nifi
-       service: nifi
-     - type: file
-       path: /opt/nifi/logs/nifi-user.log
-       source: nifi
-       service: nifi
-     - type: file
-       path: /opt/nifi/logs/nifi-bootstrap.log
-       source: nifi
-       service: nifi
-     - type: file
-       path: /opt/nifi/logs/nifi-request.log
-       source: nifi
-       service: nifi
-       tags:
-         - "log_type:request"
-   ```
-
-   The `log_type:request` tag on the request log entry routes HTTP access logs through a dedicated parsing pipeline that extracts standard HTTP attributes (method, status code, URL path, client IP).
-
-   NiFi is a Java application that produces multiline stack traces. To aggregate them into single log events, add a `log_processing_rules` entry to the application log:
-
-   ```yaml
-   logs:
-     - type: file
-       path: /opt/nifi/logs/nifi-app.log
-       source: nifi
-       service: nifi
-       log_processing_rules:
-         - type: multi_line
-           name: java_stack_trace
-           pattern: \d{4}-\d{2}-\d{2}
-   ```
-
-3. [Restart the Agent][5].
-
 ### Validation
 
 [Run the Agent's status subcommand][6] and look for `nifi` under the Checks section.

nifi/assets/configuration/spec.yaml

@@ -87,17 +87,3 @@ files:
       path: /opt/nifi/logs/nifi-app.log
       source: nifi
       service: nifi
-    - type: file
-      path: /opt/nifi/logs/nifi-user.log
-      source: nifi
-      service: nifi
-    - type: file
-      path: /opt/nifi/logs/nifi-bootstrap.log
-      source: nifi
-      service: nifi
-    - type: file
-      path: /opt/nifi/logs/nifi-request.log
-      source: nifi
-      service: nifi
-      tags:
-        - "log_type:request"