metrics/prometheus: define type once for histograms

This commit is contained in:
Richard Patel 2020-05-12 18:07:31 +02:00
parent 0b63915430
commit c63d3858af
No known key found for this signature in database
GPG key ID: 77A6A8A1CF8D1762

View file

@ -30,7 +30,7 @@ var (
typeCounterTpl = "# TYPE %s counter\n" typeCounterTpl = "# TYPE %s counter\n"
typeSummaryTpl = "# TYPE %s summary\n" typeSummaryTpl = "# TYPE %s summary\n"
keyValueTpl = "%s %v\n\n" keyValueTpl = "%s %v\n\n"
keyQuantileTagValueTpl = "%s {quantile=\"%s\"} %v\n\n" keyQuantileTagValueTpl = "%s {quantile=\"%s\"} %v\n"
) )
// collector is a collection of byte buffers that aggregate Prometheus reports // collector is a collection of byte buffers that aggregate Prometheus reports
@ -62,9 +62,11 @@ func (c *collector) addHistogram(name string, m metrics.Histogram) {
pv := []float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999} pv := []float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999}
ps := m.Percentiles(pv) ps := m.Percentiles(pv)
c.writeSummaryCounter(name, m.Count()) c.writeSummaryCounter(name, m.Count())
c.buff.WriteString(fmt.Sprintf(typeSummaryTpl, mutateKey(name)))
for i := range pv { for i := range pv {
c.writeSummaryPercentile(name, strconv.FormatFloat(pv[i], 'f', -1, 64), ps[i]) c.writeSummaryPercentile(name, strconv.FormatFloat(pv[i], 'f', -1, 64), ps[i])
} }
c.buff.WriteRune('\n')
} }
func (c *collector) addMeter(name string, m metrics.Meter) { func (c *collector) addMeter(name string, m metrics.Meter) {
@ -75,9 +77,11 @@ func (c *collector) addTimer(name string, m metrics.Timer) {
pv := []float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999} pv := []float64{0.5, 0.75, 0.95, 0.99, 0.999, 0.9999}
ps := m.Percentiles(pv) ps := m.Percentiles(pv)
c.writeSummaryCounter(name, m.Count()) c.writeSummaryCounter(name, m.Count())
c.buff.WriteString(fmt.Sprintf(typeSummaryTpl, mutateKey(name)))
for i := range pv { for i := range pv {
c.writeSummaryPercentile(name, strconv.FormatFloat(pv[i], 'f', -1, 64), ps[i]) c.writeSummaryPercentile(name, strconv.FormatFloat(pv[i], 'f', -1, 64), ps[i])
} }
c.buff.WriteRune('\n')
} }
func (c *collector) addResettingTimer(name string, m metrics.ResettingTimer) { func (c *collector) addResettingTimer(name string, m metrics.ResettingTimer) {
@ -87,9 +91,11 @@ func (c *collector) addResettingTimer(name string, m metrics.ResettingTimer) {
ps := m.Percentiles([]float64{50, 95, 99}) ps := m.Percentiles([]float64{50, 95, 99})
val := m.Values() val := m.Values()
c.writeSummaryCounter(name, len(val)) c.writeSummaryCounter(name, len(val))
c.buff.WriteString(fmt.Sprintf(typeSummaryTpl, mutateKey(name)))
c.writeSummaryPercentile(name, "0.50", ps[0]) c.writeSummaryPercentile(name, "0.50", ps[0])
c.writeSummaryPercentile(name, "0.95", ps[1]) c.writeSummaryPercentile(name, "0.95", ps[1])
c.writeSummaryPercentile(name, "0.99", ps[2]) c.writeSummaryPercentile(name, "0.99", ps[2])
c.buff.WriteRune('\n')
} }
func (c *collector) writeGaugeCounter(name string, value interface{}) { func (c *collector) writeGaugeCounter(name string, value interface{}) {
@ -106,7 +112,6 @@ func (c *collector) writeSummaryCounter(name string, value interface{}) {
func (c *collector) writeSummaryPercentile(name, p string, value interface{}) { func (c *collector) writeSummaryPercentile(name, p string, value interface{}) {
name = mutateKey(name) name = mutateKey(name)
c.buff.WriteString(fmt.Sprintf(typeSummaryTpl, name))
c.buff.WriteString(fmt.Sprintf(keyQuantileTagValueTpl, name, p, value)) c.buff.WriteString(fmt.Sprintf(keyQuantileTagValueTpl, name, p, value))
} }