feat(contrib/mcp-go) Make simpler way to include mcp-go tracer

contrib/mark3labs/mcp-go/README.md

@@ -19,13 +19,8 @@ func main() {
     }
 	defer tracer.Stop()
 
-    // Add tracing to your server hooks
-    hooks := &server.Hooks{}
-    mcpgotrace.AddServerHooks(hooks)
-
     srv := server.NewMCPServer("my-server", "1.0.0",
-        server.WithHooks(hooks),
-        server.WithToolHandlerMiddleware(mcpgotrace.NewToolHandlerMiddleware()))
+        mcpgotrace.WithTracing())
 }
 ```
 

contrib/mark3labs/mcp-go/example_test.go

@@ -1,7 +1,7 @@
 // Unless explicitly stated otherwise all files in this repository are licensed
 // under the Apache License Version 2.0.
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
-// Copyright 2016 Datadog, Inc.
+// Copyright 2025 Datadog, Inc.
 
 package mcpgo_test
 
@@ -15,12 +15,7 @@ func Example() {
 	tracer.Start()
 	defer tracer.Stop()
 
-	// Create server hooks and add Datadog tracing
-	hooks := &server.Hooks{}
-	mcpgotrace.AddServerHooks(hooks)
-
 	srv := server.NewMCPServer("my-server", "1.0.0",
-		server.WithHooks(hooks),
-		server.WithToolHandlerMiddleware(mcpgotrace.NewToolHandlerMiddleware()))
+		mcpgotrace.WithTracing())
 	_ = srv
 }

contrib/mark3labs/mcp-go/mcpgo.go

@@ -1,7 +1,7 @@
 // Unless explicitly stated otherwise all files in this repository are licensed
 // under the Apache License Version 2.0.
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
-// Copyright 2016 Datadog, Inc.
+// Copyright 2025 Datadog, Inc.
 
 package mcpgo // import "github.com/DataDog/dd-trace-go/contrib/mark3labs/mcp-go/v2"
 

contrib/mark3labs/mcp-go/mcpgo_test.go

@@ -1,7 +1,7 @@
 // Unless explicitly stated otherwise all files in this repository are licensed
 // under the Apache License Version 2.0.
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
-// Copyright 2016 Datadog, Inc.
+// Copyright 2025 Datadog, Inc.
 
 package mcpgo
 
@@ -47,11 +47,7 @@ func TestIntegrationSessionInitialize(t *testing.T) {
 	tt := testTracer(t)
 	defer tt.Stop()
 
-	hooks := &server.Hooks{}
-	AddServerHooks(hooks)
-
-	srv := server.NewMCPServer("test-server", "1.0.0",
-		server.WithHooks(hooks))
+	srv := server.NewMCPServer("test-server", "1.0.0", WithTracing())
 
 	ctx := context.Background()
 	initRequest := `{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2024-11-05","capabilities":{},"clientInfo":{"name":"test-client","version":"1.0.0"}}}`
@@ -102,8 +98,7 @@ func TestIntegrationToolCallSuccess(t *testing.T) {
 	tt := testTracer(t)
 	defer tt.Stop()
 
-	srv := server.NewMCPServer("test-server", "1.0.0",
-		server.WithToolHandlerMiddleware(NewToolHandlerMiddleware()))
+	srv := server.NewMCPServer("test-server", "1.0.0", WithTracing())
 
 	calcTool := mcp.NewTool("calculator",
 		mcp.WithDescription("A simple calculator"))
@@ -180,8 +175,7 @@ func TestIntegrationToolCallError(t *testing.T) {
 	tt := testTracer(t)
 	defer tt.Stop()
 
-	srv := server.NewMCPServer("test-server", "1.0.0",
-		server.WithToolHandlerMiddleware(NewToolHandlerMiddleware()))
+	srv := server.NewMCPServer("test-server", "1.0.0", WithTracing())
 
 	errorTool := mcp.NewTool("error_tool",
 		mcp.WithDescription("A tool that always errors"))

contrib/mark3labs/mcp-go/option.go

@@ -0,0 +1,36 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2025 Datadog, Inc.
+
+package mcpgo
+
+import (
+	"reflect"
+
+	"github.com/mark3labs/mcp-go/server"
+)
+
+// The file contains methods for easily adding tracing to a MCP server.
+
+// Pass to server.NewMCPServer to add tracing to the server.
+func WithTracing() server.ServerOption {
+	return func(s *server.MCPServer) {
+
+		// Append hooks (hooks is a private field)
+		v := reflect.ValueOf(s).Elem()
+		hooksField := v.FieldByName("hooks")
+		if !hooksField.IsValid() {
+			return
+		}
+		hooksField = reflect.NewAt(hooksField.Type(), hooksField.Addr().UnsafePointer()).Elem()
+		if hooksField.IsNil() {
+			hooksField.Set(reflect.ValueOf(&server.Hooks{}))
+		}
+		hooks := hooksField.Interface().(*server.Hooks)
+		AddServerHooks(hooks)
+
+		// Add tool handler middleware (toolHandlerMiddlewares is a private field, but this appensd to it)
+		server.WithToolHandlerMiddleware(NewToolHandlerMiddleware())(s)
+	}
+}