From a6f3300b8dc75a6254f15e03ca225e6eef557702 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Tue, 7 Apr 2015 10:32:54 +0200 Subject: [PATCH] s/ext/pbutil/g The dependency matttproud/golang_protobuf_extensions changed its package layout and thereby broke the Prometheus client_golang build. This fixes it. --- extraction/metricfamilyprocessor.go | 4 ++-- text/proto.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extraction/metricfamilyprocessor.go b/extraction/metricfamilyprocessor.go index 5edb49c..5a8f40b 100644 --- a/extraction/metricfamilyprocessor.go +++ b/extraction/metricfamilyprocessor.go @@ -20,7 +20,7 @@ import ( dto "github.com/prometheus/client_model/go" - "github.com/matttproud/golang_protobuf_extensions/ext" + "github.com/matttproud/golang_protobuf_extensions/pbutil" "github.com/prometheus/client_golang/model" ) @@ -40,7 +40,7 @@ func (m *metricFamilyProcessor) ProcessSingle(i io.Reader, out Ingester, o *Proc for { family.Reset() - if _, err := ext.ReadDelimited(i, family); err != nil { + if _, err := pbutil.ReadDelimited(i, family); err != nil { if err == io.EOF { return nil } diff --git a/text/proto.go b/text/proto.go index 058adfc..e82bbb3 100644 --- a/text/proto.go +++ b/text/proto.go @@ -18,7 +18,7 @@ import ( "io" "github.com/golang/protobuf/proto" - "github.com/matttproud/golang_protobuf_extensions/ext" + "github.com/matttproud/golang_protobuf_extensions/pbutil" dto "github.com/prometheus/client_model/go" ) @@ -27,7 +27,7 @@ import ( // protobuf format and returns the number of bytes written and any error // encountered. func WriteProtoDelimited(w io.Writer, p *dto.MetricFamily) (int, error) { - return ext.WriteDelimited(w, p) + return pbutil.WriteDelimited(w, p) } // WriteProtoText writes the MetricFamily to the writer in text format and