mirrors/statsd_exporter
1
0
Fork 1
mirror of https://github.com/prometheus/statsd_exporter.git synced 2024-06-22 06:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #216 from claytono/conflicting-histogram-fix

Browse source 
Check for histogram conflict on main name
This commit is contained in:
Matthias Rampke 2019-05-15 13:20:11 +00:00 committed by GitHub
parent 8cc291f419 cce95f6980
commit f502171bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
exporter.go
View file

@ -262,6 +262,9 @@ func (c *HistogramContainer) Get(metricName string, labels prometheus.Labels, mc
histogramVec, ok := c.Elements[mapKey] histogramVec, ok := c.Elements[mapKey]
if !ok { if !ok {
if mc.metricConflicts(metricName, HistogramMetricType) {
return nil, fmt.Errorf("metric with name %s is already registered", metricName)
}
if mc.metricConflicts(metricName+"_sum", HistogramMetricType) { if mc.metricConflicts(metricName+"_sum", HistogramMetricType) {
return nil, fmt.Errorf("metric with name %s is already registered", metricName) return nil, fmt.Errorf("metric with name %s is already registered", metricName)
} }

14
exporter_test.go
View file

@ -238,6 +238,20 @@ func TestConflictingMetrics(t *testing.T) {
}, },
}, },
}, },
{
name: "counter vs histogram",
expected: []float64{1},
in: Events{
&CounterEvent{
metricName: "histogram_test1",
value: 1,
},
&TimerEvent{
metricName: "histogram.test1",
value: 2,
},
},
},
{ {
name: "counter vs histogram sum", name: "counter vs histogram sum",
expected: []float64{1}, expected: []float64{1},