Skip to content

Refactor cachemetrics interface and label name #2157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pipecd-bot merged 1 commit into from
Jun 30, 2021
Merged

Refactor cachemetrics interface and label name #2157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/cache/cachemetrics/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const (
var (
getCounter = prometheus.NewCounterVec(
prometheus.CounterOpts{
Name: "controlplane_cache_get_operation_total",
Name: "pipecd_cache_get_operation_total",
Help: "Number of cache get operation while processing",
},
[]string{
Expand All @@ -54,7 +54,7 @@ func Register(r prometheus.Registerer) {
r.MustRegister(getCounter)
}

func IncGetOperationCounter(status StatusLabel, source SourceLabel) {
func IncGetOperationCounter(source SourceLabel, status StatusLabel) {
getCounter.With(prometheus.Labels{
statusKey: string(status),
sourceKey: string(source),
Expand Down
8 changes: 4 additions & 4 deletions pkg/cache/rediscache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,30 @@ func (c *RedisCache) Get(k interface{}) (interface{}, error) {
if err != nil {
if err == redigo.ErrNil {
cachemetrics.IncGetOperationCounter(
cachemetrics.LabelStatusMiss,
cachemetrics.LabelSourceRedis,
cachemetrics.LabelStatusMiss,
)
return nil, cache.ErrNotFound
}
return nil, err
}
if reply == nil {
cachemetrics.IncGetOperationCounter(
cachemetrics.LabelStatusMiss,
cachemetrics.LabelSourceRedis,
cachemetrics.LabelStatusMiss,
)
return nil, cache.ErrNotFound
}
if err, ok := reply.(redigo.Error); ok {
cachemetrics.IncGetOperationCounter(
cachemetrics.LabelStatusMiss,
cachemetrics.LabelSourceRedis,
cachemetrics.LabelStatusMiss,
)
return nil, err
}
cachemetrics.IncGetOperationCounter(
cachemetrics.LabelStatusHit,
cachemetrics.LabelSourceRedis,
cachemetrics.LabelStatusHit,
)
return reply, nil
}
Expand Down