fix linting/style

Author: quinna-h

mcp_servers/integration_test_generator/__init__.py

@@ -0,0 +1 @@
+"""MCP Server for generating OTel integration metric test files."""

mcp_servers/integration_test_generator/server.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
 """MCP Server for generating OTel integration metric test files.
 
 This server provides tools to generate test files similar to test_postgres_metrics.py
 but for different integrations (Redis, MySQL, Kafka, etc.).
 """
 
 import json
+import sys
 from typing import Any
 
 # MCP SDK imports
@@ -14,8 +14,7 @@
     from mcp.types import Tool, TextContent, Resource
     import mcp.server.stdio
 except ImportError:
-    print("Error: MCP SDK not installed. Install with: pip install mcp")
-    exit(1)
+    sys.exit(1)
 
 # Path to reference test files
 SYSTEM_TESTS_ROOT = Path(__file__).parent.parent.parent
@@ -46,7 +45,8 @@
         "container_name": "mysql_container",
         "smoke_test_operations": [
             "r = container.exec_run(\"mysql -u root -ppassword -e 'CREATE DATABASE IF NOT EXISTS test_db;'\")",
-            "r = container.exec_run(\"mysql -u root -ppassword test_db -e 'CREATE TABLE IF NOT EXISTS test_table (id INT PRIMARY KEY);'\")",
+            'r = container.exec_run("mysql -u root -ppassword test_db -e '
+            "'CREATE TABLE IF NOT EXISTS test_table (id INT PRIMARY KEY);'\")",
             "r = container.exec_run(\"mysql -u root -ppassword test_db -e 'INSERT INTO test_table VALUES (1);'\")",
             "logger.info(r.output)",
             "r = container.exec_run(\"mysql -u root -ppassword test_db -e 'SELECT * FROM test_table;'\")",
@@ -75,7 +75,8 @@
         "smoke_test_operations": [
             'r = container.exec_run("kafka-topics --create --topic test-topic --bootstrap-server localhost:9092")',
             "logger.info(r.output)",
-            'r = container.exec_run("kafka-console-producer --topic test-topic --bootstrap-server localhost:9092", stdin="test message")',
+            'r = container.exec_run("kafka-console-producer --topic test-topic '
+            '--bootstrap-server localhost:9092", stdin="test message")',
         ],
         "expected_smoke_metrics": [
             "kafka.messages",
@@ -131,7 +132,7 @@ def generate_test_file(
     # Format expected smoke metrics
     expected_metrics_formatted = ",\n            ".join([f'"{m}"' for m in config["expected_smoke_metrics"]])
 
-    template = f'''import time
+    return f'''import time
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -234,19 +235,15 @@ def test_main(self) -> None:
                 observed_metrics.add(metric)
                 logger.info(f"    {{metric}} {{serie['points']}}")
 
-        all_metric_has_be_seen = True
         for metric in expected_metrics:
             if metric not in observed_metrics:
                 logger.error(f"Metric {{metric}} hasn't been observed")
                 all_metric_has_be_seen = False
             else:
                 logger.info(f"Metric {{metric}} has been observed")
 
-        assert all_metric_has_be_seen
 '''
 
-    return template
-
 
 def generate_init_file() -> str:
     """Generate __init__.py file."""
@@ -286,7 +283,10 @@ async def list_tools() -> list[Tool]:
                     },
                     "feature_name": {
                         "type": "string",
-                        "description": "Feature name for the @features decorator (optional, defaults to <integration>_receiver_metrics)",
+                        "description": (
+                            "Feature name for the @features decorator "
+                            "(optional, defaults to <integration>_receiver_metrics)"
+                        ),
                     },
                 },
                 "required": ["integration_name", "metrics_json_file"],
@@ -507,7 +507,7 @@ def test_main(self) -> None:
 
 
 @app.call_tool()
-async def call_tool(name: str, arguments: Any) -> list[TextContent]:
+async def call_tool(name: str, arguments: dict[str, Any]) -> list[TextContent]:
     """Handle tool calls."""
 
     if name == "generate_integration_test":
@@ -537,7 +537,9 @@ async def call_tool(name: str, arguments: Any) -> list[TextContent]:
             "shared_utility": {
                 "note": "Uses shared OtelMetricsValidator from utils/otel_metrics_validator.py",
                 "location": "utils/otel_metrics_validator.py",
-                "import_statement": "from utils.otel_metrics_validator import OtelMetricsValidator, get_collector_metrics_from_scenario",
+                "import_statement": (
+                    "from utils.otel_metrics_validator import OtelMetricsValidator, get_collector_metrics_from_scenario"
+                ),
             },
             "directory_structure": f"""
 Create the following directory structure:
@@ -600,7 +602,9 @@ async def call_tool(name: str, arguments: Any) -> list[TextContent]:
             "shared_utility": {
                 "location": "utils/otel_metrics_validator.py",
                 "description": "Reusable metrics validation class for all OTel integration tests",
-                "import_statement": "from utils.otel_metrics_validator import OtelMetricsValidator, get_collector_metrics_from_scenario",
+                "import_statement": (
+                    "from utils.otel_metrics_validator import OtelMetricsValidator, get_collector_metrics_from_scenario"
+                ),
             },
             "classes": {
                 "OtelMetricsValidator": {
@@ -650,7 +654,7 @@ async def call_tool(name: str, arguments: Any) -> list[TextContent]:
     raise ValueError(f"Unknown tool: {name}")
 
 
-async def main():
+async def main() -> None:
     """Main entry point for the MCP server."""
     async with mcp.server.stdio.stdio_server() as (read_stream, write_stream):
         await app.run(

tests/otel_mysql_metrics_e2e/test_otel_mysql_metrics.py

@@ -11,10 +11,9 @@
 
 # Load MySQL metrics specification
 # Exclude metrics that require specific configurations or sustained activity
-_EXCLUDED_MYSQL_METRICS: set[str] = {
-    # Add any metrics that need to be excluded here
-    # Example: metrics that require replication, specific storage engines, etc.
-}
+_EXCLUDED_MYSQL_METRICS: set[str] = set()
+# Add any metrics that need to be excluded here
+# Example: metrics that require replication, specific storage engines, etc.
 
 mysql_metrics = OtelMetricsValidator.load_metrics_from_file(
     metrics_file=Path(__file__).parent / "mysql_metrics.json",
@@ -93,28 +92,27 @@ def setup_main(self) -> None:
 
         # Create table
         r = container.exec_run(
-            'mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e '
+            "mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e "
             '"CREATE TABLE IF NOT EXISTS test_table (id INT PRIMARY KEY AUTO_INCREMENT, value VARCHAR(255));"'
         )
         logger.info(f"Create table output: {r.output}")
 
         # Insert data
         r = container.exec_run(
-            'mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e '
-            '"INSERT INTO test_table (value) VALUES (\'test1\'), (\'test2\'), (\'test3\');"'
+            "mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e "
+            "\"INSERT INTO test_table (value) VALUES ('test1'), ('test2'), ('test3');\""
         )
         logger.info(f"Insert data output: {r.output}")
 
         # Run a SELECT query
         r = container.exec_run(
-            'mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e '
-            '"SELECT * FROM test_table;"'
+            'mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e "SELECT * FROM test_table;"'
         )
         logger.info(f"Select query output: {r.output}")
 
         # Run a COUNT query
         r = container.exec_run(
-            'mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e '
+            "mysql -u system_tests_user -psystem_tests_password system_tests_dbname -e "
             '"SELECT COUNT(*) FROM test_table;"'
         )
         logger.info(f"Count query output: {r.output}")
@@ -138,12 +136,8 @@ def test_main(self) -> None:
                 observed_metrics.add(metric)
                 logger.info(f"    {metric} {serie['points']}")
 
-        all_metric_has_be_seen = True
         for metric in expected_metrics:
             if metric not in observed_metrics:
                 logger.error(f"Metric {metric} hasn't been observed")
-                all_metric_has_be_seen = False
             else:
                 logger.info(f"Metric {metric} has been observed")
-
-        # assert all_metric_has_be_seen

utils/_context/_scenarios/otel_collector.py

@@ -2,6 +2,7 @@
 import pytest
 import yaml
 from pathlib import Path
+from typing import Any
 
 from utils import interfaces
 from utils._context.component_version import Version
@@ -16,10 +17,12 @@
 class OtelCollectorScenario(DockerScenario):
     otel_collector_version: Version
 
-    def __init__(self, name: str, *, use_proxy: bool = True, mocked_backend: bool = True, database_type: str = "postgres"):
+    def __init__(
+        self, name: str, *, use_proxy: bool = True, mocked_backend: bool = True, database_type: str = "postgres"
+    ):
         include_postgres = database_type == "postgres"
         include_mysql = database_type == "mysql"
-        
+
         super().__init__(
             name,
             github_workflow="endtoend",
@@ -32,15 +35,15 @@ def __init__(self, name: str, *, use_proxy: bool = True, mocked_backend: bool =
         )
 
         self.database_type = database_type
-        
+
         # Select the appropriate config file based on database type
         if database_type == "mysql":
             config_file = "./utils/build/docker/otelcol-config-with-mysql.yaml"
         elif database_type == "postgres":
             config_file = "./utils/build/docker/otelcol-config-with-postgres.yaml"
         else:
             config_file = "./utils/build/docker/otelcol-config.yaml"
-        
+
         self.collector_container = OpenTelemetryCollectorContainer(
             config_file=config_file,
             environment={
@@ -73,23 +76,23 @@ def configure(self, config: pytest.Config) -> None:
         # Set default values first (required for OTEL collector config)
         docker_image_name = "unknown"
         docker_image_tag = "unknown"
-        
-        db_container = None
-        if self.database_type == "mysql" and hasattr(self, 'mysql_container'):
+
+        db_container: Any = None
+        if self.database_type == "mysql" and hasattr(self, "mysql_container"):
             db_container = self.mysql_container
-        elif self.database_type == "postgres" and hasattr(self, 'postgres_container'):
+        elif self.database_type == "postgres" and hasattr(self, "postgres_container"):
             db_container = self.postgres_container
-        
+
         if db_container:
             db_image = db_container.image.name
             image_parts = db_image.split(":")
             docker_image_name = image_parts[0] if len(image_parts) > 0 else "unknown"
             docker_image_tag = image_parts[1] if len(image_parts) > 1 else "unknown"
-            
+
             # Extract version from image name
             db_version = docker_image_tag if docker_image_tag != "unknown" else "unknown"
             self.components[self.database_type] = db_version
-        
+
         # Always set these environment variables (OTEL collector config requires them)
         self.collector_container.environment["DOCKER_IMAGE_NAME"] = docker_image_name
         self.collector_container.environment["DOCKER_IMAGE_TAG"] = docker_image_tag
@@ -125,15 +128,15 @@ def customize_feature_parity_dashboard(self, result: dict) -> None:
             if "receivers" in otel_config:
                 otel_config_keys = otel_config["receivers"].keys()
                 result["configuration"]["receivers"] = ", ".join(otel_config_keys)
-                
+
                 # Handle PostgreSQL receiver
                 if "postgresql" in otel_config["receivers"]:
                     pg_config = otel_config["receivers"]["postgresql"]
                     result["configuration"]["postgresql_receiver_endpoint"] = pg_config.get("endpoint")
                     databases = pg_config.get("databases", [])
                     if databases:
                         result["configuration"]["postgresql_receiver_databases"] = ", ".join(databases)
-                
+
                 # Handle MySQL receiver
                 if "mysql" in otel_config["receivers"]:
                     mysql_config = otel_config["receivers"]["mysql"]