feat: expose metrics for MCP calls #38
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| name: argocd-mcp-server-e2e | ||
|
|
||
| services: | ||
| argocd-server-mock: | ||
| image: argocd-server-mock | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package metrics | ||
|
|
||
| import ( | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/client_golang/prometheus/promauto" | ||
| ) | ||
|
|
||
| var ( | ||
|
|
||
| // MCPCallsTotal counts total MCP calls by method, name (for `tools/call`) and success | ||
| MCPCallsTotal = promauto.NewCounterVec( | ||
| prometheus.CounterOpts{ | ||
| Name: "mcp_calls_total", | ||
| Help: "Total number of MCP calls", | ||
| }, | ||
| []string{"method", "name", "success"}, | ||
| ) | ||
|
Comment on lines
+11
to
+17
There was a problem hiding this comment. I think we should have separate metrics for
There was a problem hiding this comment. Also it would be nice to have
Collaborator
Author
There was a problem hiding this comment. but since we have labels for the Also, that's what is usually done with HTTP metrics: you have labels for the method ( There was a problem hiding this comment. I thought that having separated metrics for tools and methods would help with creating separate dashboards , since I guess we would be mostly interested into looking at the tools charts ( more than the methods ones ), but maybe I'm wrong.
Collaborator
Author
There was a problem hiding this comment. I believe we ca have a single metric and use the labels to focus on tool calls per name, etc. |
||
|
|
||
| // MCPCallDuration measures the duration of MCP calls by method, name (for `tools/call`) and success | ||
| MCPCallDuration = promauto.NewHistogramVec( | ||
| prometheus.HistogramOpts{ | ||
| Name: "mcp_call_duration_seconds", | ||
| Help: "Duration of MCP calls in seconds", | ||
| Buckets: prometheus.DefBuckets, | ||
| }, | ||
| []string{"method", "name", "success"}, | ||
| ) | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package server | ||
|
|
||
| import ( | ||
| "context" | ||
| "log/slog" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "github.com/codeready-toolchain/argocd-mcp-server/internal/metrics" | ||
| "github.com/modelcontextprotocol/go-sdk/mcp" | ||
| ) | ||
|
|
||
| func NewMetricsMiddleware(logger *slog.Logger) mcp.Middleware { | ||
| return func(next mcp.MethodHandler) mcp.MethodHandler { | ||
| return func(ctx context.Context, method string, req mcp.Request) (mcp.Result, error) { | ||
| logger.Debug("metrics-middleware: received request", "method", method, "params", req.GetParams()) | ||
| // measure the duration of the request | ||
| start := time.Now() | ||
| // call the next middleware | ||
| result, err := next(ctx, method, req) | ||
| // measure the duration of the request | ||
| duration := time.Since(start) | ||
| var tool string | ||
| if p, ok := req.GetParams().(*mcp.CallToolParamsRaw); ok { | ||
| tool = p.Name | ||
| } | ||
| success := err == nil | ||
| if r, ok := result.(*mcp.CallToolResult); ok { | ||
| logger.Debug("metrics-middleware: call tool result", "is-error", r.IsError) | ||
| success = success && !r.IsError | ||
| } | ||
| // increment/update the metrics | ||
| metrics.MCPCallsTotal.WithLabelValues(method, tool, strconv.FormatBool(success)).Inc() | ||
| metrics.MCPCallDuration.WithLabelValues(method, tool, strconv.FormatBool(success)).Observe(float64(duration.Seconds())) | ||
| return result, err | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we usually expose the metrics using it's own server and different port , but I guess this is fine for the mcp server that is not exposed publicly.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've opened a discussion on Slack for this specific question