Merge pull request #80 from peterbourgon/histogram-registry-fix

beorn7 · beorn7 · commit 54238dea8fa4 · 2015-02-20T19:23:41.000+01:00
Fix for Histogram in registry.writePB
diff --git a/prometheus/registry.go b/prometheus/registry.go
@@ -464,6 +464,8 @@ func (r *registry) writePB(w io.Writer, writeEncoded encoder) (int, error) {
 			metricFamily.Type = dto.MetricType_SUMMARY.Enum()
 		case dtoMetric.Untyped != nil:
 			metricFamily.Type = dto.MetricType_UNTYPED.Enum()
+		case dtoMetric.Histogram != nil:
+			metricFamily.Type = dto.MetricType_HISTOGRAM.Enum()
 		default:
 			return 0, fmt.Errorf("empty metric collected: %s", dtoMetric)
 		}

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,8 @@ func (r *registry) writePB(w io.Writer, writeEncoded encoder) (int, error) {`
`464`	`464`	`metricFamily.Type = dto.MetricType_SUMMARY.Enum()`
`465`	`465`	`case dtoMetric.Untyped != nil:`
`466`	`466`	`metricFamily.Type = dto.MetricType_UNTYPED.Enum()`
	`467`	`+ case dtoMetric.Histogram != nil:`
	`468`	`+ metricFamily.Type = dto.MetricType_HISTOGRAM.Enum()`
`467`	`469`	`default:`
`468`	`470`	`return 0, fmt.Errorf("empty metric collected: %s", dtoMetric)`
`469`	`471`	`}`