9045b79bc2
This PR modifies how the metrics library handles `Enabled`: previously, the package `init` decided whether to serve real metrics or just dummy-types. This has several drawbacks: - During pkg init, we need to determine whether metrics are enabled or not. So we first hacked in a check if certain geth-specific commandline-flags were enabled. Then we added a similar check for geth-env-vars. Then we almost added a very elaborate check for toml-config-file, plus toml parsing. - Using "real" types and dummy types interchangeably means that everything is hidden behind interfaces. This has a performance penalty, and also it just adds a lot of code. This PR removes the interface stuff, uses concrete types, and allows for the setting of Enabled to happen later. It is still assumed that `metrics.Enable()` is invoked early on. The somewhat 'heavy' operations, such as ticking meters and exp-decay, now checks the enable-flag to prevent resource leak. The change may be large, but it's mostly pretty trivial, and from the last time I gutted the metrics, I ensured that we have fairly good test coverage. --------- Co-authored-by: Felix Lange <fjl@twurst.com>
84 lines
1.7 KiB
Go
84 lines
1.7 KiB
Go
package metrics
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func BenchmarkMeter(b *testing.B) {
|
|
m := NewMeter()
|
|
b.ResetTimer()
|
|
for i := 0; i < b.N; i++ {
|
|
m.Mark(1)
|
|
}
|
|
}
|
|
func TestMeter(t *testing.T) {
|
|
m := NewMeter()
|
|
m.Mark(47)
|
|
if v := m.Snapshot().Count(); v != 47 {
|
|
t.Fatalf("have %d want %d", v, 47)
|
|
}
|
|
}
|
|
func TestGetOrRegisterMeter(t *testing.T) {
|
|
r := NewRegistry()
|
|
NewRegisteredMeter("foo", r).Mark(47)
|
|
if m := GetOrRegisterMeter("foo", r).Snapshot(); m.Count() != 47 {
|
|
t.Fatal(m.Count())
|
|
}
|
|
}
|
|
|
|
func TestMeterDecay(t *testing.T) {
|
|
m := newMeter()
|
|
m.Mark(1)
|
|
m.tick()
|
|
rateMean := m.Snapshot().RateMean()
|
|
time.Sleep(100 * time.Millisecond)
|
|
m.tick()
|
|
if m.Snapshot().RateMean() >= rateMean {
|
|
t.Error("m.RateMean() didn't decrease")
|
|
}
|
|
}
|
|
|
|
func TestMeterNonzero(t *testing.T) {
|
|
m := NewMeter()
|
|
m.Mark(3)
|
|
if count := m.Snapshot().Count(); count != 3 {
|
|
t.Errorf("m.Count(): 3 != %v\n", count)
|
|
}
|
|
}
|
|
|
|
func TestMeterStop(t *testing.T) {
|
|
l := len(arbiter.meters)
|
|
m := NewMeter()
|
|
if l+1 != len(arbiter.meters) {
|
|
t.Errorf("arbiter.meters: %d != %d\n", l+1, len(arbiter.meters))
|
|
}
|
|
m.Stop()
|
|
if l != len(arbiter.meters) {
|
|
t.Errorf("arbiter.meters: %d != %d\n", l, len(arbiter.meters))
|
|
}
|
|
}
|
|
|
|
func TestMeterZero(t *testing.T) {
|
|
m := NewMeter().Snapshot()
|
|
if count := m.Count(); count != 0 {
|
|
t.Errorf("m.Count(): 0 != %v\n", count)
|
|
}
|
|
}
|
|
|
|
func TestMeterRepeat(t *testing.T) {
|
|
m := NewMeter()
|
|
for i := 0; i < 101; i++ {
|
|
m.Mark(int64(i))
|
|
}
|
|
if count := m.Snapshot().Count(); count != 5050 {
|
|
t.Errorf("m.Count(): 5050 != %v\n", count)
|
|
}
|
|
for i := 0; i < 101; i++ {
|
|
m.Mark(int64(i))
|
|
}
|
|
if count := m.Snapshot().Count(); count != 10100 {
|
|
t.Errorf("m.Count(): 10100 != %v\n", count)
|
|
}
|
|
}
|