mcp-mesh 0.7.14__py3-none-any.whl → 0.7.15__py3-none-any.whl

_mcp_mesh/__init__.py

@@ -31,7 +31,7 @@ from .engine.decorator_registry import (
     get_decorator_stats,
 )
 
-__version__ = "0.7.14"
+__version__ = "0.7.15"
 
 # Store reference to runtime processor if initialized
 _runtime_processor = None

_mcp_mesh/engine/unified_mcp_proxy.py

@@ -80,16 +80,17 @@ class UnifiedMCPProxy:
             return False
 
     def _create_fastmcp_client(self, endpoint: str):
-        """Create FastMCP client with DNS detection for threading conflict avoidance.
+        """Create FastMCP client with dynamic trace header injection.
 
-        This method detects DNS names vs IP addresses and forces HTTP fallback for DNS names
-        to avoid FastMCP client threading conflicts in containerized environments.
+        Uses httpx event_hooks to inject trace headers at REQUEST TIME rather than
+        at transport construction time. This ensures the current trace context is
+        captured when the HTTP request is actually made, fixing the trace hierarchy bug.
 
         Args:
             endpoint: MCP endpoint URL
 
         Returns:
-            FastMCP Client instance with or without trace headers
+            FastMCP Client instance with dynamic trace header injection
         """
         try:
             # Extract hostname from endpoint URL for DNS detection
@@ -101,42 +102,70 @@ class UnifiedMCPProxy:
             # DNS resolution works perfectly with FastMCP - no need to force HTTP fallback
             self.logger.debug(f"✅ Using FastMCP client for endpoint: {hostname}")
 
+            # Use stream_timeout for read timeout (default 300s for LLM calls)
+            import httpx
             from fastmcp import Client
             from fastmcp.client.transports import StreamableHttpTransport
 
-            # Try to get current trace context for header injection
-            trace_headers = self._get_trace_headers()
-
-            # Use stream_timeout for read timeout (default 300s for LLM calls)
-            # Note: sse_read_timeout is deprecated, use httpx_client_factory instead
-            import httpx
+            # Capture self for use in nested function
+            proxy_instance = self
 
             def create_httpx_client(**kwargs):
+                """Create httpx client with dynamic trace header injection via event hooks."""
+
+                def inject_trace_headers_hook(request: httpx.Request) -> None:
+                    """Inject trace headers at REQUEST TIME for correct context propagation.
+
+                    This hook runs just before each HTTP request is sent, capturing the
+                    current trace context at that moment. This fixes the trace hierarchy
+                    bug where headers were captured at client creation time instead.
+                    """
+                    try:
+                        from ..tracing.context import TraceContext
+                        from ..tracing.utils import is_tracing_enabled
+
+                        if not is_tracing_enabled():
+                            return
+
+                        trace_context = TraceContext.get_current()
+                        if trace_context:
+                            request.headers["X-Trace-ID"] = trace_context.trace_id
+                            request.headers["X-Parent-Span"] = trace_context.span_id
+                            proxy_instance.logger.trace(
+                                f"🔗 TRACE_HOOK: Injecting at request time - "
+                                f"trace_id={trace_context.trace_id[:8]}... "
+                                f"parent_span={trace_context.span_id[:8]}..."
+                            )
+                    except Exception as e:
+                        # Never fail HTTP requests due to tracing issues
+                        proxy_instance.logger.trace(
+                            f"🔗 TRACE_HOOK: Failed to inject headers: {e}"
+                        )
+
                 # Override timeout to use stream_timeout for long-running LLM calls
                 kwargs["timeout"] = httpx.Timeout(
-                    timeout=self.stream_timeout,
+                    timeout=proxy_instance.stream_timeout,
                     connect=30.0,  # 30s for connection
-                    read=self.stream_timeout,  # Long read timeout for SSE streams
+                    read=proxy_instance.stream_timeout,  # Long read timeout for SSE streams
                     write=30.0,  # 30s for writes
                     pool=30.0,  # 30s for pool
                 )
+
+                # Add event hook for dynamic trace header injection
+                existing_hooks = kwargs.get("event_hooks", {})
+                request_hooks = existing_hooks.get("request", [])
+                request_hooks.append(inject_trace_headers_hook)
+                existing_hooks["request"] = request_hooks
+                kwargs["event_hooks"] = existing_hooks
+
                 return httpx.AsyncClient(**kwargs)
 
-            if trace_headers:
-                # Create client with trace headers for distributed tracing
-                transport = StreamableHttpTransport(
-                    url=endpoint,
-                    headers=trace_headers,
-                    httpx_client_factory=create_httpx_client,
-                )
-                return Client(transport)
-            else:
-                # Create standard client when no trace context available
-                transport = StreamableHttpTransport(
-                    url=endpoint,
-                    httpx_client_factory=create_httpx_client,
-                )
-                return Client(transport)
+            # Create client WITHOUT static headers - headers injected via hook at request time
+            transport = StreamableHttpTransport(
+                url=endpoint,
+                httpx_client_factory=create_httpx_client,
+            )
+            return Client(transport)
 
         except ImportError as e:
             # DNS names or FastMCP not available - this will trigger HTTP fallback

{mcp_mesh-0.7.14.dist-info → mcp_mesh-0.7.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-mesh
-Version: 0.7.14
+Version: 0.7.15
 Summary: Kubernetes-native platform for distributed MCP applications
 Project-URL: Homepage, https://github.com/dhyansraj/mcp-mesh
 Project-URL: Documentation, https://github.com/dhyansraj/mcp-mesh/tree/main/docs

{mcp_mesh-0.7.14.dist-info → mcp_mesh-0.7.15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-_mcp_mesh/__init__.py,sha256=-gStWMScU6cYjn31jIRI33ijxi_KEcvd38UMKStn6cY,2720
+_mcp_mesh/__init__.py,sha256=xx8r72WkHqUhfJc2KwE6aOwUNPw5F5OuDJs4znH8B3g,2720
 _mcp_mesh/engine/__init__.py,sha256=U_6Kw3vA_3RiNK0Oln5c5C7WvA9lSONV22wWzfxYHNw,2975
 _mcp_mesh/engine/async_mcp_client.py,sha256=Sz-rXTkb1Mng_f0SpLqLuOdPJ8vZjv3DFy0i8yYOqYk,8792
 _mcp_mesh/engine/base_injector.py,sha256=qzRLZqFP2VvEFagVovkpdldvDmm3VwPHm6tHwV58a2k,5648
@@ -16,7 +16,7 @@ _mcp_mesh/engine/session_manager.py,sha256=MCr0_fXBaUjXM51WU5EhDkiGvBdfzYQFVNb9D
 _mcp_mesh/engine/signature_analyzer.py,sha256=ftn9XsX0ZHWIaACdjgBVtCuIdqVU_4ST8cvcpzu4HTk,12339
 _mcp_mesh/engine/tool_executor.py,sha256=Bf_9d02EEY9_yHm1p1-5YZ4rY6MPxn4SVpI6-3sm1uo,5456
 _mcp_mesh/engine/tool_schema_builder.py,sha256=SQCxQIrSfdLu9-dLqiFurQLK7dhl0dc0xa0ibaxU-iE,3644
-_mcp_mesh/engine/unified_mcp_proxy.py,sha256=dkhX0jgP_Rcg63WVM3h0KefEHSPh51dwmqgZyoKztGw,36521
+_mcp_mesh/engine/unified_mcp_proxy.py,sha256=4Zi2jGu16B7ObJ3YymD4gsUHdWdbmtX2hc0srUVTfsc,38175
 _mcp_mesh/engine/provider_handlers/__init__.py,sha256=LLTCOgnuM3dlogbLmrpiMK3oB5L22eAmDC4BfxJ-L2I,593
 _mcp_mesh/engine/provider_handlers/base_provider_handler.py,sha256=J-SPFFFG1eFSUVvfsv7y4EuNM4REjSxaYWC5E_lC6Pc,4195
 _mcp_mesh/engine/provider_handlers/claude_handler.py,sha256=CCmlsWiCfIcgrLbAZzeSnl0g2pq0uDffT8zOj4F-sPQ,15727
@@ -144,7 +144,7 @@ mesh/__init__.py,sha256=Va5XRBWgejQurad7Maz3E-zPY7vu431B2_4sAdCu1zk,3868
 mesh/decorators.py,sha256=v0l_0oAS_UZBQLC1WwhJQTil9AvGMCFL9kYS-N7febk,59627
 mesh/helpers.py,sha256=ITua2zdxbXeBLF5qS46A6A1P2GQNbfL_2_BMCKazQ4U,12575
 mesh/types.py,sha256=n0MxrBYZJ84xyQWGf_X2ZbVWSAaIcEBkRV7qaCmX6Ac,17008
-mcp_mesh-0.7.14.dist-info/METADATA,sha256=v_7rAKuWQPhWqjYprDbtQ7Leo3KjHWktq1xydV1T4LM,4973
-mcp_mesh-0.7.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mcp_mesh-0.7.14.dist-info/licenses/LICENSE,sha256=_EBQHRQThv9FPOLc5eFOUdeeRO0mYwChC7cx60dM1tM,1078
-mcp_mesh-0.7.14.dist-info/RECORD,,
+mcp_mesh-0.7.15.dist-info/METADATA,sha256=pV9YaeDfY1G07nCjfD-s24ggiQcKZ3-9zk75uev9VAc,4973
+mcp_mesh-0.7.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mcp_mesh-0.7.15.dist-info/licenses/LICENSE,sha256=_EBQHRQThv9FPOLc5eFOUdeeRO0mYwChC7cx60dM1tM,1078
+mcp_mesh-0.7.15.dist-info/RECORD,,