Bump github.com/prometheus/common to v0.7.0

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

6 files changed, 26 insertions, 20 deletions

diff --git a/vendor/github.com/alecthomas/template/go.mod b/vendor/github.com/alecthomas/template/go.mod
new file mode 100644
index 0000000..a70670a
--- /dev/null
+++ b/vendor/github.com/alecthomas/template/go.mod
@@ -0,0 +1 @@
+module github.com/alecthomas/template
diff --git a/vendor/github.com/alecthomas/units/go.mod b/vendor/github.com/alecthomas/units/go.mod
new file mode 100644
index 0000000..f572173
--- /dev/null
+++ b/vendor/github.com/alecthomas/units/go.mod
@@ -0,0 +1 @@
+module github.com/alecthomas/units
diff --git a/vendor/github.com/golang/protobuf/proto/properties.go b/vendor/github.com/golang/protobuf/proto/properties.go
index 79668ff..a4b8c0c 100644
--- a/vendor/github.com/golang/protobuf/proto/properties.go
+++ b/vendor/github.com/golang/protobuf/proto/properties.go
@@ -38,7 +38,6 @@ package proto
 import (
         "fmt"
         "log"
-        "os"
         "reflect"
         "sort"
         "strconv"
@@ -194,7 +193,7 @@ func (p *Properties) Parse(s string) {
         // "bytes,49,opt,name=foo,def=hello!"
         fields := strings.Split(s, ",") // breaks def=, but handled below.
         if len(fields) < 2 {
-                fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
+                log.Printf("proto: tag has too few fields: %q", s)
                 return
         }
 
@@ -214,7 +213,7 @@ func (p *Properties) Parse(s string) {
                 p.WireType = WireBytes
                 // no numeric converter for non-numeric types
         default:
-                fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
+                log.Printf("proto: tag has unknown wire type: %q", s)
                 return
         }
 
diff --git a/vendor/github.com/prometheus/common/expfmt/text_create.go b/vendor/github.com/prometheus/common/expfmt/text_create.go
index 8e473d0..0327865 100644
--- a/vendor/github.com/prometheus/common/expfmt/text_create.go
+++ b/vendor/github.com/prometheus/common/expfmt/text_create.go
@@ -14,9 +14,10 @@
 package expfmt
 
 import (
-        "bytes"
+        "bufio"
         "fmt"
         "io"
+        "io/ioutil"
         "math"
         "strconv"
         "strings"
@@ -27,7 +28,7 @@ import (
         dto "github.com/prometheus/client_model/go"
 )
 
-// enhancedWriter has all the enhanced write functions needed here. bytes.Buffer
+// enhancedWriter has all the enhanced write functions needed here. bufio.Writer
 // implements it.
 type enhancedWriter interface {
         io.Writer
@@ -37,14 +38,13 @@ type enhancedWriter interface {
 }
 
 const (
-        initialBufSize    = 512
         initialNumBufSize = 24
 )
 
 var (
         bufPool = sync.Pool{
                 New: func() interface{} {
-                        return bytes.NewBuffer(make([]byte, 0, initialBufSize))
+                        return bufio.NewWriter(ioutil.Discard)
                 },
         }
         numBufPool = sync.Pool{
@@ -75,16 +75,14 @@ func MetricFamilyToText(out io.Writer, in *dto.MetricFamily) (written int, err e
         }
 
         // Try the interface upgrade. If it doesn't work, we'll use a
-        // bytes.Buffer from the sync.Pool and write out its content to out in a
-        // single go in the end.
+        // bufio.Writer from the sync.Pool.
         w, ok := out.(enhancedWriter)
         if !ok {
-                b := bufPool.Get().(*bytes.Buffer)
-                b.Reset()
+                b := bufPool.Get().(*bufio.Writer)
+                b.Reset(out)
                 w = b
                 defer func() {
-                        bWritten, bErr := out.Write(b.Bytes())
-                        written = bWritten
+                        bErr := b.Flush()
                         if err == nil {
                                 err = bErr
                         }
diff --git a/vendor/github.com/prometheus/common/expfmt/text_parse.go b/vendor/github.com/prometheus/common/expfmt/text_parse.go
index ec3d86b..342e594 100644
--- a/vendor/github.com/prometheus/common/expfmt/text_parse.go
+++ b/vendor/github.com/prometheus/common/expfmt/text_parse.go
@@ -325,7 +325,7 @@ func (p *TextParser) startLabelValue() stateFn {
         // - Other labels have to be added to currentLabels for signature calculation.
         if p.currentMF.GetType() == dto.MetricType_SUMMARY {
                 if p.currentLabelPair.GetName() == model.QuantileLabel {
-                        if p.currentQuantile, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
+                        if p.currentQuantile, p.err = parseFloat(p.currentLabelPair.GetValue()); p.err != nil {
                                 // Create a more helpful error message.
                                 p.parseError(fmt.Sprintf("expected float as value for 'quantile' label, got %q", p.currentLabelPair.GetValue()))
                                 return nil
@@ -337,7 +337,7 @@ func (p *TextParser) startLabelValue() stateFn {
         // Similar special treatment of histograms.
         if p.currentMF.GetType() == dto.MetricType_HISTOGRAM {
                 if p.currentLabelPair.GetName() == model.BucketLabel {
-                        if p.currentBucket, p.err = strconv.ParseFloat(p.currentLabelPair.GetValue(), 64); p.err != nil {
+                        if p.currentBucket, p.err = parseFloat(p.currentLabelPair.GetValue()); p.err != nil {
                                 // Create a more helpful error message.
                                 p.parseError(fmt.Sprintf("expected float as value for 'le' label, got %q", p.currentLabelPair.GetValue()))
                                 return nil
@@ -392,7 +392,7 @@ func (p *TextParser) readingValue() stateFn {
         if p.readTokenUntilWhitespace(); p.err != nil {
                 return nil // Unexpected end of input.
         }
-        value, err := strconv.ParseFloat(p.currentToken.String(), 64)
+        value, err := parseFloat(p.currentToken.String())
         if err != nil {
                 // Create a more helpful error message.
                 p.parseError(fmt.Sprintf("expected float as value, got %q", p.currentToken.String()))
@@ -755,3 +755,10 @@ func histogramMetricName(name string) string {
                 return name
         }
 }
+
+func parseFloat(s string) (float64, error) {
+        if strings.ContainsAny(s, "pP_") {
+                return 0, fmt.Errorf("unsupported character in float")
+        }
+        return strconv.ParseFloat(s, 64)
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 7cf21f7..416ae83 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,7 +1,7 @@
-# github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
+# github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 github.com/alecthomas/template
 github.com/alecthomas/template/parse
-# github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf
+# github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4
 github.com/alecthomas/units
 # github.com/beevik/ntp v0.2.0
 github.com/beevik/ntp
@@ -13,7 +13,7 @@ github.com/coreos/go-systemd/dbus
 github.com/ema/qdisc
 # github.com/godbus/dbus v0.0.0-20190402143921-271e53dc4968
 github.com/godbus/dbus
-# github.com/golang/protobuf v1.3.1
+# github.com/golang/protobuf v1.3.2
 github.com/golang/protobuf/proto
 # github.com/hodgesds/perf-utils v0.0.7
 github.com/hodgesds/perf-utils
@@ -39,7 +39,7 @@ github.com/prometheus/client_golang/prometheus/internal
 github.com/prometheus/client_golang/prometheus/promhttp
 # github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
 github.com/prometheus/client_model/go
-# github.com/prometheus/common v0.4.1
+# github.com/prometheus/common v0.7.0
 github.com/prometheus/common/expfmt
 github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
 github.com/prometheus/common/log