re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Peter Bourgon 2015-04-07 10:32:54 +02:00
parent 3657dc8002
commit a6f3300b8d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extraction/metricfamilyprocessor.go
View File

@ -20,7 +20,7 @@ import (
dto "github.com/prometheus/client_model/go" 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" "github.com/prometheus/client_golang/model"
) )
@ -40,7 +40,7 @@ func (m *metricFamilyProcessor) ProcessSingle(i io.Reader, out Ingester, o *Proc
for { for {
family.Reset() family.Reset()
if _, err := ext.ReadDelimited(i, family); err != nil { if _, err := pbutil.ReadDelimited(i, family); err != nil {
if err == io.EOF { if err == io.EOF {
return nil return nil
} }

4
text/proto.go
View File

@ -18,7 +18,7 @@ import (
"io" "io"
"github.com/golang/protobuf/proto" "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" dto "github.com/prometheus/client_model/go"
) )
@ -27,7 +27,7 @@ import (
// protobuf format and returns the number of bytes written and any error // protobuf format and returns the number of bytes written and any error
// encountered. // encountered.
func WriteProtoDelimited(w io.Writer, p *dto.MetricFamily) (int, error) { 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 // WriteProtoText writes the MetricFamily to the writer in text format and