kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-05 17:27:51 +00:00
Code Issues Projects Releases Packages Activity Actions

update error metric to api requests total

Browse source
This commit is contained in:
Vivek Kumar 2024-05-03 19:32:10 +05:30
parent 489349152a
commit 00c093074c
No known key found for this signature in database
GPG key ID: 81605FDFBA4EF440
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
pkg/client/metrics/metrics.go
View file

@ -44,35 +44,33 @@ var (
Buckets: prometheus.DefBuckets, Buckets: prometheus.DefBuckets,
}, },
[]string{"path", "server"}, []string{"path", "server"},
) )
// define a counter for API errors for various ErrorTypes // define a counter for API errors for various ErrorTypes
apiErrorCount = metrics.NewCounterVec( apiRequestsTotal = metrics.NewCounterVec(
&metrics.CounterOpts{ &metrics.CounterOpts{
Namespace: "prometheus_adapter", Namespace: "prometheus_adapter",
Subsystem: "prometheus_client", Subsystem: "prometheus_client",
Name: "api_errors_total", Name: "api_requests_total",
Help: "Total number of API errors", Help: "Total number of API requests",
}, },
[]string{"error_code", "path", "server"}, []string{"code", "path", "server"},
) )
) )
func MetricsHandler() (http.HandlerFunc, error) { func MetricsHandler() (http.HandlerFunc, error) {
registry := metrics.NewKubeRegistry() registry := metrics.NewKubeRegistry()
errRegisterQueryLatency := registry.Register(queryLatency) err := registry.Register(queryLatency)
if errRegisterQueryLatency != nil { if err != nil {
return nil, errRegisterQueryLatency return nil, err
} }
errRegisterAPIErrorCount := registry.Register(apiErrorCount) err = registry.Register(apiRequestsTotal)
if errRegisterAPIErrorCount != nil { if err != nil {
return nil, errRegisterAPIErrorCount return nil, err
} }
apimetrics.Register() apimetrics.Register()
return func(w http.ResponseWriter, req *http.Request) { return func(w http.ResponseWriter, req *http.Request) {
legacyregistry.Handler().ServeHTTP(w, req) legacyregistry.Handler().ServeHTTP(w, req)
@ -89,24 +87,26 @@ type instrumentedGenericClient struct {
func (c *instrumentedGenericClient) Do(ctx context.Context, verb, endpoint string, query url.Values) (client.APIResponse, error) { func (c *instrumentedGenericClient) Do(ctx context.Context, verb, endpoint string, query url.Values) (client.APIResponse, error) {
startTime := time.Now() startTime := time.Now()
var err error var err error
var resp client.APIResponse
defer func() { defer func() {
endTime := time.Now() endTime := time.Now()
// skip calls where we don't make the actual request
if err != nil { if err != nil {
if apiErr, wasAPIErr := err.(*client.Error); wasAPIErr { if apiErr, wasAPIErr := err.(*client.Error); wasAPIErr {
// measure API errors // measure API errors
apiErrorCount.With(prometheus.Labels{"error_code": string(apiErr.Type), "path": endpoint, "server": c.serverName}).Inc() apiRequestsTotal.With(prometheus.Labels{"code": string(apiErr.Type), "path": endpoint, "server": c.serverName}).Inc()
} else { } else {
// increment a generic error code counter // increment a generic error code counter
apiErrorCount.With(prometheus.Labels{"error_code": "generic", "path": endpoint, "server": c.serverName}).Inc() apiRequestsTotal.With(prometheus.Labels{"code": "generic", "path": endpoint, "server": c.serverName}).Inc()
} }
return return
} else {
apiRequestsTotal.With(prometheus.Labels{"code": string(resp.Status), "path": endpoint, "server": c.serverName}).Inc()
} }
queryLatency.With(prometheus.Labels{"path": endpoint, "server": c.serverName}).Observe(endTime.Sub(startTime).Seconds()) queryLatency.With(prometheus.Labels{"path": endpoint, "server": c.serverName}).Observe(endTime.Sub(startTime).Seconds())
}() }()
var resp client.APIResponse
resp, err = c.client.Do(ctx, verb, endpoint, query) resp, err = c.client.Do(ctx, verb, endpoint, query)
return resp, err return resp, err
} }