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>
123 lines
3.2 KiB
Go
123 lines
3.2 KiB
Go
package influxdb
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
)
|
|
|
|
func readMeter(namespace, name string, i interface{}) (string, map[string]interface{}) {
|
|
switch metric := i.(type) {
|
|
case *metrics.Counter:
|
|
measurement := fmt.Sprintf("%s%s.count", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"value": metric.Snapshot().Count(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.CounterFloat64:
|
|
measurement := fmt.Sprintf("%s%s.count", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"value": metric.Snapshot().Count(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.Gauge:
|
|
measurement := fmt.Sprintf("%s%s.gauge", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"value": metric.Snapshot().Value(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.GaugeFloat64:
|
|
measurement := fmt.Sprintf("%s%s.gauge", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"value": metric.Snapshot().Value(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.GaugeInfo:
|
|
ms := metric.Snapshot()
|
|
measurement := fmt.Sprintf("%s%s.gauge", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"value": ms.Value().String(),
|
|
}
|
|
return measurement, fields
|
|
case metrics.Histogram:
|
|
ms := metric.Snapshot()
|
|
if ms.Count() <= 0 {
|
|
break
|
|
}
|
|
ps := ms.Percentiles([]float64{0.25, 0.5, 0.75, 0.95, 0.99, 0.999, 0.9999})
|
|
measurement := fmt.Sprintf("%s%s.histogram", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"count": ms.Count(),
|
|
"max": ms.Max(),
|
|
"mean": ms.Mean(),
|
|
"min": ms.Min(),
|
|
"stddev": ms.StdDev(),
|
|
"variance": ms.Variance(),
|
|
"p25": ps[0],
|
|
"p50": ps[1],
|
|
"p75": ps[2],
|
|
"p95": ps[3],
|
|
"p99": ps[4],
|
|
"p999": ps[5],
|
|
"p9999": ps[6],
|
|
}
|
|
return measurement, fields
|
|
case *metrics.Meter:
|
|
ms := metric.Snapshot()
|
|
measurement := fmt.Sprintf("%s%s.meter", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"count": ms.Count(),
|
|
"m1": ms.Rate1(),
|
|
"m5": ms.Rate5(),
|
|
"m15": ms.Rate15(),
|
|
"mean": ms.RateMean(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.Timer:
|
|
ms := metric.Snapshot()
|
|
ps := ms.Percentiles([]float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999})
|
|
|
|
measurement := fmt.Sprintf("%s%s.timer", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"count": ms.Count(),
|
|
"max": ms.Max(),
|
|
"mean": ms.Mean(),
|
|
"min": ms.Min(),
|
|
"stddev": ms.StdDev(),
|
|
"variance": ms.Variance(),
|
|
"p50": ps[0],
|
|
"p75": ps[1],
|
|
"p95": ps[2],
|
|
"p99": ps[3],
|
|
"p999": ps[4],
|
|
"p9999": ps[5],
|
|
"m1": ms.Rate1(),
|
|
"m5": ms.Rate5(),
|
|
"m15": ms.Rate15(),
|
|
"meanrate": ms.RateMean(),
|
|
}
|
|
return measurement, fields
|
|
case *metrics.ResettingTimer:
|
|
ms := metric.Snapshot()
|
|
if ms.Count() == 0 {
|
|
break
|
|
}
|
|
ps := ms.Percentiles([]float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999})
|
|
measurement := fmt.Sprintf("%s%s.timer", namespace, name)
|
|
fields := map[string]interface{}{
|
|
"count": ms.Count(),
|
|
"max": ms.Max(),
|
|
"mean": ms.Mean(),
|
|
"min": ms.Min(),
|
|
"p50": ps[0],
|
|
"p75": ps[1],
|
|
"p95": ps[2],
|
|
"p99": ps[3],
|
|
"p999": ps[4],
|
|
"p9999": ps[5],
|
|
}
|
|
return measurement, fields
|
|
}
|
|
return "", nil
|
|
}
|