Merge pull request #761 from prometheus/fabxc/vendor

Update client_golang dependency to 0.6.0

Godeps/Godeps.json

@@ -35,23 +35,23 @@
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/extraction",
-			"Comment": "0.5.0-8-gfcd2986",
-			"Rev": "fcd2986466589bcf7a411ec3b52d85a8df9dcc8b"
+			"Comment": "0.6.0",
+			"Rev": "e319516b0f97867d36151451cab8d4aefbe1786b"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/model",
-			"Comment": "0.5.0-8-gfcd2986",
-			"Rev": "fcd2986466589bcf7a411ec3b52d85a8df9dcc8b"
+			"Comment": "0.6.0",
+			"Rev": "e319516b0f97867d36151451cab8d4aefbe1786b"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/prometheus",
-			"Comment": "0.5.0-8-gfcd2986",
-			"Rev": "fcd2986466589bcf7a411ec3b52d85a8df9dcc8b"
+			"Comment": "0.6.0",
+			"Rev": "e319516b0f97867d36151451cab8d4aefbe1786b"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/text",
-			"Comment": "0.5.0-8-gfcd2986",
-			"Rev": "fcd2986466589bcf7a411ec3b52d85a8df9dcc8b"
+			"Comment": "0.6.0",
+			"Rev": "e319516b0f97867d36151451cab8d4aefbe1786b"
 		},
 		{
 			"ImportPath": "github.com/prometheus/client_model/go",

Godeps/_workspace/src/github.com/prometheus/client_golang/model/labelname.go

@@ -61,7 +61,8 @@ const (
 	QuantileLabel = "quantile"
 )
 
-var labelNameRE = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
+// LabelNameRE is a regular expression matching valid label names.
+var LabelNameRE = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
 
 // A LabelName is a key for a LabelSet or Metric.  It has a value associated
 // therewith.
@@ -73,7 +74,7 @@ func (ln *LabelName) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	if err := unmarshal(&s); err != nil {
 		return err
 	}
-	if !labelNameRE.MatchString(s) {
+	if !LabelNameRE.MatchString(s) {
 		return fmt.Errorf("%q is not a valid label name", s)
 	}
 	*ln = LabelName(s)

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go

@@ -9,16 +9,15 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/prometheus/client_golang/model"
+	"github.com/golang/protobuf/proto"
 
 	dto "github.com/prometheus/client_model/go"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/prometheus/client_golang/model"
 )
 
 var (
 	metricNameRE = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_:]*$`)
-	labelNameRE  = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_]*$`)
 )
 
 // Labels represents a collection of label name -> value mappings. This type is
@@ -194,6 +193,6 @@ func (d *Desc) String() string {
 }
 
 func checkLabelName(l string) bool {
-	return labelNameRE.MatchString(l) &&
+	return model.LabelNameRE.MatchString(l) &&
 		!strings.HasPrefix(l, model.ReservedLabelPrefix)
 }

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go

@@ -147,7 +147,7 @@ type HistogramOpts struct {
 	// element in the slice is the upper inclusive bound of a bucket. The
 	// values must be sorted in strictly increasing order. There is no need
 	// to add a highest bucket with +Inf bound, it will be added
-	// implicitly. The default value is DefObjectives.
+	// implicitly. The default value is DefBuckets.
 	Buckets []float64
 }
 

Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go

@@ -19,9 +19,10 @@ import (
 	"io"
 	"io/ioutil"
 	"testing"
-	dto "github.com/prometheus/client_model/go"
 
 	"github.com/matttproud/golang_protobuf_extensions/pbutil"
+
+	dto "github.com/prometheus/client_model/go"
 )
 
 // Benchmarks to show how much penalty text format parsing actually inflicts.