Compare commits
No commits in common. "4e491639e6515953de314afcfa1017ea0803f93b" and "d783709a53d143a52cb1036af5fcd612f756afe7" have entirely different histories.
4e491639e6
...
d783709a53
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
||||
.idea/
|
@ -2,7 +2,7 @@ package metrics_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleCounter() {
|
||||
|
@ -2,7 +2,7 @@ package metrics_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleFloatCounter() {
|
||||
|
@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleGauge() {
|
||||
|
2
go.mod
2
go.mod
@ -1,4 +1,4 @@
|
||||
module go.unistack.org/metrics
|
||||
module github.com/VictoriaMetrics/metrics
|
||||
|
||||
require (
|
||||
github.com/valyala/histogram v1.2.0
|
||||
|
@ -36,7 +36,7 @@ func initSupportedRuntimeMetrics(rms [][2]string) [][2]string {
|
||||
if _, ok := exposedMetrics[metricName]; ok {
|
||||
supportedMetrics = append(supportedMetrics, rm)
|
||||
} else {
|
||||
log.Printf("go.unistack.org/metrics: do not expose %s metric, since the corresponding metric %s isn't supported in the current Go runtime", rm[1], metricName)
|
||||
log.Printf("github.com/VictoriaMetrics/metrics: do not expose %s metric, since the corresponding metric %s isn't supported in the current Go runtime", rm[1], metricName)
|
||||
}
|
||||
}
|
||||
return supportedMetrics
|
||||
|
56
histogram.go
56
histogram.go
@ -4,7 +4,6 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"math"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
@ -64,8 +63,6 @@ type Histogram struct {
|
||||
|
||||
// sum is the sum of all the values put into Histogram
|
||||
sum float64
|
||||
|
||||
compatible bool
|
||||
}
|
||||
|
||||
// Reset resets the given histogram.
|
||||
@ -85,14 +82,6 @@ func (h *Histogram) Reset() {
|
||||
h.mu.Unlock()
|
||||
}
|
||||
|
||||
func (h *Histogram) GetSum() float64 {
|
||||
return h.sum
|
||||
}
|
||||
|
||||
func (h *Histogram) GetDecimalBuckets() [decimalBucketsCount]*[bucketsPerDecimal]uint64 {
|
||||
return h.decimalBuckets
|
||||
}
|
||||
|
||||
// Update updates h with v.
|
||||
//
|
||||
// Negative values and NaNs are ignored.
|
||||
@ -198,9 +187,6 @@ func (h *Histogram) VisitNonZeroBuckets(f func(vmrange string, count uint64)) {
|
||||
func NewHistogram(name string) *Histogram {
|
||||
return defaultSet.NewHistogram(name)
|
||||
}
|
||||
func NewCompatibleHistogram(name string) *Histogram {
|
||||
return defaultSet.NewCompatibleHistogram(name)
|
||||
}
|
||||
|
||||
// GetOrCreateHistogram returns registered histogram with the given name
|
||||
// or creates new histogram if the registry doesn't contain histogram with
|
||||
@ -219,9 +205,6 @@ func NewCompatibleHistogram(name string) *Histogram {
|
||||
func GetOrCreateHistogram(name string) *Histogram {
|
||||
return defaultSet.GetOrCreateHistogram(name)
|
||||
}
|
||||
func GetOrCreateCompatibleHistogram(name string) *Histogram {
|
||||
return defaultSet.GetOrCreateCompatibleHistogram(name)
|
||||
}
|
||||
|
||||
// UpdateDuration updates request duration based on the given startTime.
|
||||
func (h *Histogram) UpdateDuration(startTime time.Time) {
|
||||
@ -254,10 +237,6 @@ var (
|
||||
)
|
||||
|
||||
func (h *Histogram) marshalTo(prefix string, w io.Writer) {
|
||||
if h.compatible {
|
||||
h.marshalToPrometheus(prefix, w)
|
||||
return
|
||||
}
|
||||
countTotal := uint64(0)
|
||||
h.VisitNonZeroBuckets(func(vmrange string, count uint64) {
|
||||
tag := fmt.Sprintf("vmrange=%q", vmrange)
|
||||
@ -278,41 +257,6 @@ func (h *Histogram) marshalTo(prefix string, w io.Writer) {
|
||||
}
|
||||
fmt.Fprintf(w, "%s_count%s %d\n", name, labels, countTotal)
|
||||
}
|
||||
func (h *Histogram) marshalToPrometheus(prefix string, w io.Writer) {
|
||||
countTotal := uint64(0)
|
||||
inf := false
|
||||
h.VisitNonZeroBuckets(func(vmrange string, count uint64) {
|
||||
v := strings.Split(vmrange, "...")
|
||||
if len(v) != 2 {
|
||||
return
|
||||
}
|
||||
if v[1] == "+Inf" {
|
||||
inf = true
|
||||
}
|
||||
tag := fmt.Sprintf("le=%q", v[1])
|
||||
metricName := addTag(prefix, tag)
|
||||
name, labels := splitMetricName(metricName)
|
||||
countTotal += count
|
||||
fmt.Fprintf(w, "%s_bucket%s %d\n", name, labels, countTotal)
|
||||
})
|
||||
if countTotal == 0 {
|
||||
return
|
||||
}
|
||||
if !inf {
|
||||
tag := fmt.Sprintf("le=%q", "+Inf")
|
||||
metricName := addTag(prefix, tag)
|
||||
name, labels := splitMetricName(metricName)
|
||||
fmt.Fprintf(w, "%s_bucket%s %d\n", name, labels, countTotal)
|
||||
}
|
||||
name, labels := splitMetricName(prefix)
|
||||
sum := h.getSum()
|
||||
if float64(int64(sum)) == sum {
|
||||
fmt.Fprintf(w, "%s_sum%s %d\n", name, labels, int64(sum))
|
||||
} else {
|
||||
fmt.Fprintf(w, "%s_sum%s %g\n", name, labels, sum)
|
||||
}
|
||||
fmt.Fprintf(w, "%s_count%s %d\n", name, labels, countTotal)
|
||||
}
|
||||
|
||||
func (h *Histogram) getSum() float64 {
|
||||
h.mu.Lock()
|
||||
|
@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleHistogram() {
|
||||
|
@ -3,7 +3,7 @@ package metrics_test
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleWritePrometheus() {
|
||||
|
@ -99,10 +99,10 @@ func writeIOMetrics(w io.Writer) {
|
||||
data, err := ioutil.ReadFile(ioFilepath)
|
||||
if err != nil {
|
||||
// Do not spam the logs with errors - this error cannot be fixed without process restart.
|
||||
// See https://go.unistack.org/metrics/issues/42
|
||||
// See https://github.com/VictoriaMetrics/metrics/issues/42
|
||||
if atomic.CompareAndSwapUint32(&procSelfIOErrLogged, 0, 1) {
|
||||
log.Printf("ERROR: metrics: cannot read process_io_* metrics from %q, so these metrics won't be updated until the error is fixed; "+
|
||||
"see https://go.unistack.org/metrics/issues/42 ; The error: %s", ioFilepath, err)
|
||||
"see https://github.com/VictoriaMetrics/metrics/issues/42 ; The error: %s", ioFilepath, err)
|
||||
}
|
||||
}
|
||||
|
||||
|
33
set.go
33
set.go
@ -85,11 +85,6 @@ func (s *Set) NewHistogram(name string) *Histogram {
|
||||
s.registerMetric(name, h)
|
||||
return h
|
||||
}
|
||||
func (s *Set) NewCompatibleHistogram(name string) *Histogram {
|
||||
h := &Histogram{compatible: true}
|
||||
s.registerMetric(name, h)
|
||||
return h
|
||||
}
|
||||
|
||||
// GetOrCreateHistogram returns registered histogram in s with the given name
|
||||
// or creates new histogram if s doesn't contain histogram with the given name.
|
||||
@ -132,34 +127,6 @@ func (s *Set) GetOrCreateHistogram(name string) *Histogram {
|
||||
}
|
||||
return h
|
||||
}
|
||||
func (s *Set) GetOrCreateCompatibleHistogram(name string) *Histogram {
|
||||
s.mu.Lock()
|
||||
nm := s.m[name]
|
||||
s.mu.Unlock()
|
||||
if nm == nil {
|
||||
// Slow path - create and register missing histogram.
|
||||
if err := validateMetric(name); err != nil {
|
||||
panic(fmt.Errorf("BUG: invalid metric name %q: %s", name, err))
|
||||
}
|
||||
nmNew := &namedMetric{
|
||||
name: name,
|
||||
metric: &Histogram{compatible: true},
|
||||
}
|
||||
s.mu.Lock()
|
||||
nm = s.m[name]
|
||||
if nm == nil {
|
||||
nm = nmNew
|
||||
s.m[name] = nm
|
||||
s.a = append(s.a, nm)
|
||||
}
|
||||
s.mu.Unlock()
|
||||
}
|
||||
h, ok := nm.metric.(*Histogram)
|
||||
if !ok {
|
||||
panic(fmt.Errorf("BUG: metric %q isn't a Histogram. It is %T", name, nm.metric))
|
||||
}
|
||||
return h
|
||||
}
|
||||
|
||||
// NewCounter registers and returns new counter with the given name in the s.
|
||||
//
|
||||
|
@ -3,7 +3,7 @@ package metrics_test
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleSet() {
|
||||
|
20
summary.go
20
summary.go
@ -31,26 +31,6 @@ type Summary struct {
|
||||
window time.Duration
|
||||
}
|
||||
|
||||
func (s *Summary) GetSum() float64 {
|
||||
return s.sum
|
||||
}
|
||||
|
||||
func (s *Summary) GetCount() uint64 {
|
||||
return s.count
|
||||
}
|
||||
|
||||
func (s *Summary) GetTime() time.Duration {
|
||||
return s.window
|
||||
}
|
||||
|
||||
func (s *Summary) GetQuantiles() []float64 {
|
||||
return s.quantiles
|
||||
}
|
||||
|
||||
func (s *Summary) GetQuantileValues() []float64 {
|
||||
return s.quantileValues
|
||||
}
|
||||
|
||||
// NewSummary creates and returns new summary with the given name.
|
||||
//
|
||||
// name must be valid Prometheus-compatible metric with possible labels.
|
||||
|
@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"go.unistack.org/metrics"
|
||||
"github.com/VictoriaMetrics/metrics"
|
||||
)
|
||||
|
||||
func ExampleSummary() {
|
||||
|
Loading…
Reference in New Issue
Block a user