Skip to content

Commit a6f3300

Browse files
committed
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.
1 parent 3657dc8 commit a6f3300

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

extraction/metricfamilyprocessor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
dto "github.com/prometheus/client_model/go"
2222

23-
"github.com/matttproud/golang_protobuf_extensions/ext"
23+
"github.com/matttproud/golang_protobuf_extensions/pbutil"
2424

2525
"github.com/prometheus/client_golang/model"
2626
)
@@ -40,7 +40,7 @@ func (m *metricFamilyProcessor) ProcessSingle(i io.Reader, out Ingester, o *Proc
4040
for {
4141
family.Reset()
4242

43-
if _, err := ext.ReadDelimited(i, family); err != nil {
43+
if _, err := pbutil.ReadDelimited(i, family); err != nil {
4444
if err == io.EOF {
4545
return nil
4646
}

text/proto.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"io"
1919

2020
"github.com/golang/protobuf/proto"
21-
"github.com/matttproud/golang_protobuf_extensions/ext"
21+
"github.com/matttproud/golang_protobuf_extensions/pbutil"
2222

2323
dto "github.com/prometheus/client_model/go"
2424
)
@@ -27,7 +27,7 @@ import (
2727
// protobuf format and returns the number of bytes written and any error
2828
// encountered.
2929
func WriteProtoDelimited(w io.Writer, p *dto.MetricFamily) (int, error) {
30-
return ext.WriteDelimited(w, p)
30+
return pbutil.WriteDelimited(w, p)
3131
}
3232

3333
// WriteProtoText writes the MetricFamily to the writer in text format and

0 commit comments

Comments
 (0)