forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

metrics: some minor nits in the registry

Browse source
This commit is contained in:
Martin Holst Swende 2024-11-27 03:37:34 +01:00
parent 9814769df7
commit 653c55725c
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
metrics/registry.go
View file

@ -1,6 +1,7 @@
package metrics package metrics
import ( import (
"errors"
"fmt" "fmt"
"reflect" "reflect"
"sort" "sort"
@ -8,14 +9,10 @@ import (
"sync" "sync"
) )
// DuplicateMetric is the error returned by Registry. Register when a metric // ErrDuplicateMetric is the error returned by Registry.Register when a metric
// already exists. If you mean to Register that metric you must first // already exists. If you mean to Register that metric you must first
// Unregister the existing metric. // Unregister the existing metric.
type DuplicateMetric string var ErrDuplicateMetric = errors.New("duplicate metric")
func (err DuplicateMetric) Error() string {
return fmt.Sprintf("duplicate metric: %s", string(err))
}
// A Registry holds references to a set of metrics by name and can iterate // A Registry holds references to a set of metrics by name and can iterate
// over them, calling callback functions provided by the user. // over them, calling callback functions provided by the user.
@ -114,13 +111,13 @@ func (r *StandardRegistry) GetOrRegister(name string, i interface{}) interface{}
return item return item
} }
// Register the given metric under the given name. Returns a DuplicateMetric // Register the given metric under the given name. Returns a ErrDuplicateMetric
// if a metric by the given name is already registered. // if a metric by the given name is already registered.
func (r *StandardRegistry) Register(name string, i interface{}) error { func (r *StandardRegistry) Register(name string, i interface{}) error {
// fast path // fast path
_, ok := r.metrics.Load(name) _, ok := r.metrics.Load(name)
if ok { if ok {
return DuplicateMetric(name) return fmt.Errorf("%w: %v", ErrDuplicateMetric, name)
} }
if v := reflect.ValueOf(i); v.Kind() == reflect.Func { if v := reflect.ValueOf(i); v.Kind() == reflect.Func {
@ -128,7 +125,7 @@ func (r *StandardRegistry) Register(name string, i interface{}) error {
} }
_, loaded, _ := r.loadOrRegister(name, i) _, loaded, _ := r.loadOrRegister(name, i)
if loaded { if loaded {
return DuplicateMetric(name) return fmt.Errorf("%w: %v", ErrDuplicateMetric, name)
} }
return nil return nil
} }
@ -326,9 +323,7 @@ func (r *PrefixedRegistry) Unregister(name string) {
} }
var ( var (
DefaultRegistry = NewRegistry() DefaultRegistry = NewRegistry()
EphemeralRegistry = NewRegistry()
AccountingRegistry = NewRegistry() // registry used in swarm
) )
// Each call the given function for each registered metric. // Each call the given function for each registered metric.
@ -347,7 +342,7 @@ func GetOrRegister(name string, i interface{}) interface{} {
return DefaultRegistry.GetOrRegister(name, i) return DefaultRegistry.GetOrRegister(name, i)
} }
// Register the given metric under the given name. Returns a DuplicateMetric // Register the given metric under the given name. Returns a ErrDuplicateMetric
// if a metric by the given name is already registered. // if a metric by the given name is already registered.
func Register(name string, i interface{}) error { func Register(name string, i interface{}) error {
return DefaultRegistry.Register(name, i) return DefaultRegistry.Register(name, i)