lint & test fixes

Signed-off-by: Shoumi <shoumimukherjee@gmail.com>

Author: shoummu1

mcpgateway/middleware/http_auth_middleware.py

@@ -8,7 +8,6 @@
 
 # Standard
 import logging
-import uuid
 
 # Third-Party
 from fastapi import Request

mcpgateway/services/a2a_service.py

@@ -28,7 +28,6 @@
 from mcpgateway.services.logging_service import LoggingService
 from mcpgateway.services.team_management_service import TeamManagementService
 from mcpgateway.services.tool_service import ToolService
-from mcpgateway.utils.correlation_id import get_correlation_id
 from mcpgateway.utils.create_slug import slugify
 from mcpgateway.utils.services_auth import encode_auth  # ,decode_auth
 

mcpgateway/services/logging_service.py

@@ -27,6 +27,13 @@
 from mcpgateway.services.log_storage_service import LogStorageService
 from mcpgateway.utils.correlation_id import get_correlation_id
 
+# Optional OpenTelemetry support
+try:
+    # Third-Party
+    from opentelemetry import trace  # type: ignore[import-untyped]
+except ImportError:
+    trace = None  # type: ignore[assignment]
+
 AnyioClosedResourceError: Optional[type]  # pylint: disable=invalid-name
 try:
     # Optional import; only used for filtering a known benign upstream error
@@ -72,20 +79,19 @@ def add_fields(self, log_record: dict, record: logging.LogRecord, message_dict:
             log_record["request_id"] = correlation_id
 
         # Add OpenTelemetry trace context if available
-        try:
-            from opentelemetry import trace
-
-            span = trace.get_current_span()
-            if span and span.is_recording():
-                span_context = span.get_span_context()
-                if span_context.is_valid:
-                    # Format trace_id and span_id as hex strings
-                    log_record["trace_id"] = format(span_context.trace_id, "032x")
-                    log_record["span_id"] = format(span_context.span_id, "016x")
-                    log_record["trace_flags"] = format(span_context.trace_flags, "02x")
-        except (ImportError, Exception):
-            # OpenTelemetry not available or error accessing span
-            pass
+        if trace is not None:
+            try:
+                span = trace.get_current_span()
+                if span and span.is_recording():
+                    span_context = span.get_span_context()
+                    if span_context.is_valid:
+                        # Format trace_id and span_id as hex strings
+                        log_record["trace_id"] = format(span_context.trace_id, "032x")
+                        log_record["span_id"] = format(span_context.span_id, "016x")
+                        log_record["trace_flags"] = format(span_context.trace_flags, "02x")
+            except Exception:
+                # Error accessing span context
+                pass
 
 
 # Create a JSON formatter with correlation ID support

tests/unit/mcpgateway/services/test_correlation_id_json_formatter.py

@@ -208,8 +208,8 @@ def test_formatter_correlation_id_with_trace_context(logger_with_formatter):
     mock_span.is_recording.return_value = True
     mock_span.get_span_context.return_value = mock_span_context
 
-    with patch("opentelemetry.trace.get_current_span") as mock_get_span:
-        mock_get_span.return_value = mock_span
+    with patch("mcpgateway.services.logging_service.trace") as mock_trace:
+        mock_trace.get_current_span.return_value = mock_span
 
         # Log a message
         logger.info("Test with both IDs")
@@ -290,8 +290,8 @@ def test_formatter_handles_invalid_span_context(logger_with_formatter):
     mock_span.is_recording.return_value = True
     mock_span.get_span_context.return_value = mock_span_context
 
-    with patch("opentelemetry.trace.get_current_span") as mock_get_span:
-        mock_get_span.return_value = mock_span
+    with patch("mcpgateway.services.logging_service.trace") as mock_trace:
+        mock_trace.get_current_span.return_value = mock_span
 
         # Log a message
         logger.info("Test with invalid span")