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

improve validation function naming

This commit is contained in:
Marco Jantke 2017-08-25 17:58:59 +02:00
parent 0b8aef084e
commit a956c5fdd6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus/desc.go
View File

@ -111,7 +111,7 @@ func NewDesc(fqName, help string, variableLabels []string, constLabels Labels) *
} }
// Validate the const label values. They can't have a wrong cardinality, so // Validate the const label values. They can't have a wrong cardinality, so
// use in len(labelValues) as expectedNumberOfValues. // use in len(labelValues) as expectedNumberOfValues.
if err := validateValuesInLabels(labelValues, len(labelValues)); err != nil { if err := validateLabelValues(labelValues, len(labelValues)); err != nil {
d.err = err d.err = err
return d return d
} }

2
prometheus/histogram.go
View File

@ -430,7 +430,7 @@ func NewConstHistogram(
buckets map[float64]uint64, buckets map[float64]uint64,
labelValues ...string, labelValues ...string,
) (Metric, error) { ) (Metric, error) {
if err := validateValuesInLabels(labelValues, len(desc.variableLabels)); err != nil { if err := validateLabelValues(labelValues, len(desc.variableLabels)); err != nil {
return nil, err return nil, err
} }
return &constHistogram{ return &constHistogram{

4
prometheus/labels.go
View File

@ -24,7 +24,7 @@ const reservedLabelPrefix = "__"
var errInconsistentCardinality = errors.New("inconsistent label cardinality") var errInconsistentCardinality = errors.New("inconsistent label cardinality")
func validateLabels(labels Labels, expectedNumberOfValues int) error { func validateValuesInLabels(labels Labels, expectedNumberOfValues int) error {
if len(labels) != expectedNumberOfValues { if len(labels) != expectedNumberOfValues {
return errInconsistentCardinality return errInconsistentCardinality
} }
@ -38,7 +38,7 @@ func validateLabels(labels Labels, expectedNumberOfValues int) error {
return nil return nil
} }
func validateValuesInLabels(vals []string, expectedNumberOfValues int) error { func validateLabelValues(vals []string, expectedNumberOfValues int) error {
if len(vals) != expectedNumberOfValues { if len(vals) != expectedNumberOfValues {
return errInconsistentCardinality return errInconsistentCardinality
} }

2
prometheus/summary.go
View File

@ -543,7 +543,7 @@ func NewConstSummary(
quantiles map[float64]float64, quantiles map[float64]float64,
labelValues ...string, labelValues ...string,
) (Metric, error) { ) (Metric, error) {
if err := validateValuesInLabels(labelValues, len(desc.variableLabels)); err != nil { if err := validateLabelValues(labelValues, len(desc.variableLabels)); err != nil {
return nil, err return nil, err
} }
return &constSummary{ return &constSummary{

2
prometheus/value.go
View File

@ -155,7 +155,7 @@ func (v *valueFunc) Write(out *dto.Metric) error {
// the Collect method. NewConstMetric returns an error if the length of // the Collect method. NewConstMetric returns an error if the length of
// labelValues is not consistent with the variable labels in Desc. // labelValues is not consistent with the variable labels in Desc.
func NewConstMetric(desc *Desc, valueType ValueType, value float64, labelValues ...string) (Metric, error) { func NewConstMetric(desc *Desc, valueType ValueType, value float64, labelValues ...string) (Metric, error) {
if err := validateValuesInLabels(labelValues, len(desc.variableLabels)); err != nil { if err := validateLabelValues(labelValues, len(desc.variableLabels)); err != nil {
return nil, err return nil, err
} }
return &constMetric{ return &constMetric{

4
prometheus/vec.go
View File

@ -207,7 +207,7 @@ func (m *metricVec) Reset() {
} }
func (m *metricVec) hashLabelValues(vals []string) (uint64, error) { func (m *metricVec) hashLabelValues(vals []string) (uint64, error) {
if err := validateValuesInLabels(vals, len(m.desc.variableLabels)); err != nil { if err := validateLabelValues(vals, len(m.desc.variableLabels)); err != nil {
return 0, err return 0, err
} }
@ -220,7 +220,7 @@ func (m *metricVec) hashLabelValues(vals []string) (uint64, error) {
} }
func (m *metricVec) hashLabels(labels Labels) (uint64, error) { func (m *metricVec) hashLabels(labels Labels) (uint64, error) {
if err := validateLabels(labels, len(m.desc.variableLabels)); err != nil { if err := validateValuesInLabels(labels, len(m.desc.variableLabels)); err != nil {
return 0, err return 0, err
} }