Make middleware factory a private constant

Author: jboolean

contrib/mark3labs/mcp-go/option.go

@@ -34,6 +34,6 @@ func WithTracing(options *TracingConfig) server.ServerOption {
 
 		server.WithHooks(hooks)(s)
 
-		server.WithToolHandlerMiddleware(NewToolHandlerMiddleware())(s)
+		server.WithToolHandlerMiddleware(toolHandlerMiddleware)(s)
 	}
 }

contrib/mark3labs/mcp-go/tracing.go

@@ -35,36 +35,34 @@ func appendTracingHooks(hooks *server.Hooks) {
 	hooks.AddOnError(tracingHooks.onError)
 }
 
-func NewToolHandlerMiddleware() server.ToolHandlerMiddleware {
-	return func(next server.ToolHandlerFunc) server.ToolHandlerFunc {
-		return func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-			toolSpan, ctx := llmobs.StartToolSpan(ctx, request.Params.Name, llmobs.WithIntegration(string(instrumentation.PackageMark3LabsMCPGo)))
+var toolHandlerMiddleware = func(next server.ToolHandlerFunc) server.ToolHandlerFunc {
+	return func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+		toolSpan, ctx := llmobs.StartToolSpan(ctx, request.Params.Name, llmobs.WithIntegration(string(instrumentation.PackageMark3LabsMCPGo)))
 
-			result, err := next(ctx, request)
+		result, err := next(ctx, request)
 
-			inputJSON, marshalErr := json.Marshal(request)
+		inputJSON, marshalErr := json.Marshal(request)
+		if marshalErr != nil {
+			instr.Logger().Warn("mcp-go: failed to marshal tool request: %v", marshalErr)
+		}
+		var outputText string
+		if result != nil {
+			resultJSON, marshalErr := json.Marshal(result)
 			if marshalErr != nil {
-				instr.Logger().Warn("mcp-go: failed to marshal tool request: %v", marshalErr)
-			}
-			var outputText string
-			if result != nil {
-				resultJSON, marshalErr := json.Marshal(result)
-				if marshalErr != nil {
-					instr.Logger().Warn("mcp-go: failed to marshal tool result: %v", marshalErr)
-				}
-				outputText = string(resultJSON)
+				instr.Logger().Warn("mcp-go: failed to marshal tool result: %v", marshalErr)
 			}
+			outputText = string(resultJSON)
+		}
 
-			toolSpan.AnnotateTextIO(string(inputJSON), outputText)
-
-			if err != nil {
-				toolSpan.Finish(llmobs.WithError(err))
-			} else {
-				toolSpan.Finish()
-			}
+		toolSpan.AnnotateTextIO(string(inputJSON), outputText)
 
-			return result, err
+		if err != nil {
+			toolSpan.Finish(llmobs.WithError(err))
+		} else {
+			toolSpan.Finish()
 		}
+
+		return result, err
 	}
 }
 

contrib/mark3labs/mcp-go/tracing_test.go

@@ -21,11 +21,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestNewToolHandlerMiddleware(t *testing.T) {
+func TestToolHandlerMiddleware(t *testing.T) {
 	mt := mocktracer.Start()
 	defer mt.Stop()
 
-	middleware := NewToolHandlerMiddleware()
+	middleware := toolHandlerMiddleware
 	assert.NotNil(t, middleware)
 }