Fix mcp instrumentation

Change-Id: I6506a60a343036a43089982aa52d4a7165db9b0d
Co-developed-by: Cursor <noreply@cursor.com>

Author: Cirilla-zmh

instrumentation-loongsuite/loongsuite-instrumentation-agentscope/src/opentelemetry/instrumentation/agentscope/__init__.py

@@ -96,6 +96,10 @@ def _setup_tracing_patch(self, wrapped, instance, args, kwargs):
         """Replace setup_tracing with no-op to use OTEL instead."""
         pass
 
+    def _check_tracing_enabled_patch(self, wrapped, instance, args, kwargs):
+        """Return False to disable tracing in native AgentScope library."""
+        return False
+
     def _instrument(self, **kwargs: Any) -> None:
         """Enable AgentScope instrumentation."""
         tracer_provider = kwargs.get("tracer_provider")
@@ -199,6 +203,18 @@ def wrap_formatter_with_tracer(wrapped, instance, args, kwargs):
             logger.debug("Patched setup_tracing")
         except Exception as e:
             logger.warning(f"Failed to patch setup_tracing: {e}")
+        
+        # Patch _check_tracing_enabled to return False
+        # We always want to disable tracing in native AgentScope library
+        try:
+            wrap_function_wrapper(
+                module="agentscope.tracing._trace",
+                name="_check_tracing_enabled",
+                wrapper=self._check_tracing_enabled_patch,
+            )
+            logger.debug("Patched _check_tracing_enabled")
+        except Exception as e:
+            logger.warning(f"Failed to patch _check_tracing_enabled: {e}")
 
     def _uninstrument(self, **kwargs: Any) -> None:
         """Disable AgentScope instrumentation."""
@@ -269,3 +285,11 @@ def _uninstrument(self, **kwargs: Any) -> None:
             logger.debug("Uninstrumented setup_tracing")
         except Exception as e:
             logger.warning(f"Failed to uninstrument setup_tracing: {e}")
+
+        try:
+            import agentscope.tracing  # noqa: PLC0415
+
+            unwrap(agentscope.tracing, "_check_tracing_enabled")
+            logger.debug("Uninstrumented _check_tracing_enabled")
+        except Exception as e:
+            logger.warning(f"Failed to uninstrument _check_tracing_enabled: {e}")

instrumentation-loongsuite/loongsuite-instrumentation-mcp/pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
 
 [project.optional-dependencies]
 instruments = [
-  "mcp >= 1.3.0, <= 1.13.1",
+  "mcp >= 1.3.0, <= 1.25.0",
 ]
 test = [
   "opentelemetry-sdk",

instrumentation-loongsuite/loongsuite-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/__init__.py

@@ -19,6 +19,7 @@
 )
 from opentelemetry.instrumentation.mcp.utils import (
     _get_logger,
+    _get_streamable_http_client_name,
     _is_version_supported,
     _is_ws_installed,
 )
@@ -53,6 +54,8 @@
     for method_name, rpc_name in RPC_NAME_MAPPING.items()
 ]
 
+_streamable_http_client_name = _get_streamable_http_client_name()
+
 
 class MCPInstrumentor(BaseInstrumentor):
     """
@@ -99,7 +102,7 @@ def _instrument(self, **kwargs: Any) -> None:
         )
         wrap_function_wrapper(
             module="mcp.client.streamable_http",
-            name="streamablehttp_client",
+            name=_streamable_http_client_name,
             wrapper=streamable_http_client_wrapper(),
         )
         wrap_function_wrapper(
@@ -140,10 +143,10 @@ def _uninstrument(self, **kwargs: Any) -> None:
         try:
             import mcp.client.streamable_http  # noqa: PLC0415
 
-            unwrap(mcp.client.streamable_http, "streamablehttp_client")
+            unwrap(mcp.client.streamable_http, _streamable_http_client_name)
         except Exception:
             logger.warning(
-                "Fail to uninstrument streamablehttp_client", exc_info=True
+                "Fail to uninstrument streamable_http_client", exc_info=True
             )
 
         try:

instrumentation-loongsuite/loongsuite-instrumentation-mcp/src/opentelemetry/instrumentation/mcp/utils.py

@@ -18,10 +18,17 @@
     _has_mcp_types = False
 
 MIN_SUPPORTED_VERSION = (1, 3, 0)
-MAX_SUPPORTED_VERSION = (1, 13, 1)
+MAX_SUPPORTED_VERSION = (1, 25, 0)
 MCP_PACKAGE_NAME = "mcp"
 DEFAULT_MAX_ATTRIBUTE_LENGTH = 1024 * 1024
 
+# Version thresholds for API changes
+# v1.24.0: streamable_http_client was added (streamablehttp_client deprecated)
+STREAMABLE_HTTP_CLIENT_NEW_NAME_VERSION = (1, 24, 0)
+# Streamable HTTP client function names
+STREAMABLE_HTTP_CLIENT_NEW_NAME = "streamable_http_client"
+STREAMABLE_HTTP_CLIENT_OLD_NAME = "streamablehttp_client"
+
 _max_attributes_length = None
 
 
@@ -77,6 +84,18 @@ def _is_version_supported() -> bool:
     )
 
 
+def _get_streamable_http_client_name() -> str:
+    """
+    Get the correct streamable HTTP client function name based on MCP version.
+    - v1.24.0+: uses `streamable_http_client` (new name)
+    - v1.3.0 - v1.23.x: uses `streamablehttp_client` (old name)
+    """
+    current_version = _get_mcp_version()
+    if current_version >= STREAMABLE_HTTP_CLIENT_NEW_NAME_VERSION:
+        return STREAMABLE_HTTP_CLIENT_NEW_NAME
+    return STREAMABLE_HTTP_CLIENT_OLD_NAME
+
+
 def _is_capture_content_enabled() -> bool:
     capture_content = environ.get(
         MCPEnvironmentVariables.CAPTURE_INPUT_ENABLED, "true"

loongsuite-distro/src/loongsuite/distro/bootstrap.py

@@ -105,7 +105,7 @@ def extract_package_name_from_requirement(req_str: str) -> str:
     
     Examples:
         "redis >= 2.6" -> "redis"
-        "opentelemetry-instrumentation==0.60b1" -> "opentelemetry-instrumentation"
+        "opentelemetry-instrumentation==0.60b0" -> "opentelemetry-instrumentation"
         "package-name~=1.0" -> "package-name"
     
     Args: