diff --git a/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware.go b/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware.go index a549dce6d46..079a18c2817 100644 --- a/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware.go +++ b/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware.go @@ -60,7 +60,9 @@ func createTracingMiddleware(tracerProvider trace.TracerProvider) mcp.Middleware toolName := toolNameFromRequest(method, req) sessionID := sessionIDFromRequest(req) spanName := method - attrs := []attribute.KeyValue{} + attrs := []attribute.KeyValue{ + otelsemconv.McpMethodName(method), + } if toolName != "" { spanName = method + " " + toolName attrs = append( @@ -71,8 +73,6 @@ func createTracingMiddleware(tracerProvider trace.TracerProvider) mcp.Middleware if toolArgs := toolArgumentsFromRequest(method, req); toolArgs != "" { attrs = append(attrs, otelsemconv.GenAIToolCallArguments(truncateForSpan(toolArgs, maxSpanAttrChars))) } - } else { - attrs = append(attrs, otelsemconv.McpMethodName(method)) } if sessionID != "" { attrs = append(attrs, otelsemconv.McpSessionID(sessionID)) diff --git a/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware_test.go b/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware_test.go index 14f4411d078..f87af3aaae9 100644 --- a/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware_test.go +++ b/cmd/jaeger/internal/extension/jaegerquery/internal/mcptools/middleware_test.go @@ -43,6 +43,7 @@ func TestTracingMiddlewareToolCallSuccess(t *testing.T) { spanData := capture.singleSpan(t) assert.Equal(t, mcpMethodToolsCall+" get_services", spanData.Name) + assertHasStringAttribute(t, spanData.Attributes, string(otelsemconv.McpMethodName("").Key), mcpMethodToolsCall) assertHasStringAttribute(t, spanData.Attributes, string(otelsemconv.GenAIToolName("").Key), "get_services") assertHasStringAttribute(t, spanData.Attributes, string(otelsemconv.GenAIOperationNameExecuteTool.Key), "execute_tool") assert.Equal(t, codes.Unset, spanData.Status.Code)