wip

Author: nina-kollman

packages/opentelemetry-instrumentation-mcp/opentelemetry/instrumentation/mcp/fastmcp_instrumentation.py

@@ -20,38 +20,6 @@ class FastMCPInstrumentor:
     def __init__(self):
         self._tracer = None
 
-    def _find_fastmcp_server_name(self, instance):
-        """Find the FastMCP server name by inspecting the call stack and garbage collector."""
-        try:
-            # First, try to find the server by checking if this tool manager belongs to a FastMCP server
-            for obj in gc.get_objects():
-                # Look for FastMCP instances that have this tool manager
-                print("NOMI - _find_fastmcp_server_name: obj:", obj)
-                if (hasattr(obj, '__class__') and
-                        obj.__class__.__name__ == 'FastMCP' and
-                        hasattr(obj, '_tool_manager') and
-                        obj._tool_manager is instance):
-                    if hasattr(obj, 'name') and obj.name:
-                        print("NOMI - _find_fastmcp_server_name: obj.name:", obj.name)
-                        return obj.name
-                    break
-
-            # Fallback: Try to find any FastMCP server in the current frame stack
-            current_frame = inspect.currentframe()
-            while current_frame:
-                for local_var in current_frame.f_locals.values():
-                    if (hasattr(local_var, '__class__') and
-                            local_var.__class__.__name__ == 'FastMCP' and
-                            hasattr(local_var, 'name') and local_var.name):
-                        print("NOMI - _find_fastmcp_server_name: local_var.name:", local_var.name)
-                        return local_var.name
-                current_frame = current_frame.f_back
-
-        except Exception:
-            pass
-
-        return None
-
     def instrument(self, tracer: Tracer):
         """Apply FastMCP-specific instrumentation."""
         self._tracer = tracer
@@ -74,8 +42,6 @@ def _fastmcp_tool_wrapper(self):
         """Create wrapper for FastMCP tool execution."""
         @dont_throw
         async def traced_method(wrapped, instance, args, kwargs):
-            print("NOMI - _fastmcp_tool_wrapper: args:", args)
-            print("NOMI - _fastmcp_tool_wrapper: kwargs:", kwargs)
             if not self._tracer:
                 return await wrapped(*args, **kwargs)
 
@@ -94,29 +60,13 @@ async def traced_method(wrapped, instance, args, kwargs):
 
             entity_name = tool_key if tool_key else "unknown_tool"
 
-            # Best practice: read FastMCP server name from execution context
-            context = None
-            if kwargs and 'context' in kwargs:
-                context = kwargs.get('context')
-            elif args and len(args) >= 3:
-                # call_tool(self, key, arguments, context=...)
-                context = args[2]
-
-            server_name = None
-            if context is not None:
-                fastmcp_obj = getattr(context, 'fastmcp', None)
-                if fastmcp_obj is not None:
-                    server_name = getattr(fastmcp_obj, 'name', None)
-            print("NOMI - _fastmcp_tool_wrapper: server_name:", server_name)
-
             # Create parent server.mcp span
             with self._tracer.start_as_current_span("mcp.server") as mcp_span:
+                mcp_span.set_attribute(SpanAttributes.TRACELOOP_WORKFLOW_NAME, str(instance))
                 mcp_span.set_attribute(SpanAttributes.TRACELOOP_SPAN_KIND, "server")
                 mcp_span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, "mcp.server")
 
-                # # Try to set the FastMCP server name as workflow name (prefer context, fallback to discovery)
-                # if not server_name:
-                #     server_name = self._find_fastmcp_server_name(instance)
+                server_name = instance.name if hasattr(instance, 'name') else "unknown_instance"
                 if server_name:
                     mcp_span.set_attribute(SpanAttributes.TRACELOOP_WORKFLOW_NAME, f"{server_name}.mcp")
 
@@ -126,10 +76,6 @@ async def traced_method(wrapped, instance, args, kwargs):
                     tool_span.set_attribute(SpanAttributes.TRACELOOP_SPAN_KIND, TraceloopSpanKindValues.TOOL.value)
                     tool_span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, entity_name)
 
-                    # Set workflow name on tool span as well if we found it
-                    if server_name:
-                        tool_span.set_attribute(SpanAttributes.TRACELOOP_WORKFLOW_NAME, server_name)
-
                     if self._should_send_prompts():
                         try:
                             input_data = {