From a956c5fdd6aa66f58fcdce478572fadf960a7dff Mon Sep 17 00:00:00 2001
From: Marco Jantke <marco.jantke@gmail.com>
Date: Fri, 25 Aug 2017 17:58:59 +0200
Subject: [PATCH] improve validation function naming

---
 prometheus/desc.go      | 2 +-
 prometheus/histogram.go | 2 +-
 prometheus/labels.go    | 4 ++--
 prometheus/summary.go   | 2 +-
 prometheus/value.go     | 2 +-
 prometheus/vec.go       | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/prometheus/desc.go b/prometheus/desc.go
index a6c37e2..920abc9 100644
--- a/prometheus/desc.go
+++ b/prometheus/desc.go
@@ -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
 	// 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
 		return d
 	}
diff --git a/prometheus/histogram.go b/prometheus/histogram.go
index 530811d..6cc6e68 100644
--- a/prometheus/histogram.go
+++ b/prometheus/histogram.go
@@ -430,7 +430,7 @@ func NewConstHistogram(
 	buckets map[float64]uint64,
 	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 &constHistogram{
diff --git a/prometheus/labels.go b/prometheus/labels.go
index 3755a9f..2502e37 100644
--- a/prometheus/labels.go
+++ b/prometheus/labels.go
@@ -24,7 +24,7 @@ const reservedLabelPrefix = "__"
 
 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 {
 		return errInconsistentCardinality
 	}
@@ -38,7 +38,7 @@ func validateLabels(labels Labels, expectedNumberOfValues int) error {
 	return nil
 }
 
-func validateValuesInLabels(vals []string, expectedNumberOfValues int) error {
+func validateLabelValues(vals []string, expectedNumberOfValues int) error {
 	if len(vals) != expectedNumberOfValues {
 		return errInconsistentCardinality
 	}
diff --git a/prometheus/summary.go b/prometheus/summary.go
index bf69a50..56b0663 100644
--- a/prometheus/summary.go
+++ b/prometheus/summary.go
@@ -543,7 +543,7 @@ func NewConstSummary(
 	quantiles map[float64]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 &constSummary{
diff --git a/prometheus/value.go b/prometheus/value.go
index b0d7e60..4a9cca6 100644
--- a/prometheus/value.go
+++ b/prometheus/value.go
@@ -155,7 +155,7 @@ func (v *valueFunc) Write(out *dto.Metric) error {
 // the Collect method. NewConstMetric returns an error if the length of
 // labelValues is not consistent with the variable labels in Desc.
 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 &constMetric{
diff --git a/prometheus/vec.go b/prometheus/vec.go
index 6c483b6..65d13fe 100644
--- a/prometheus/vec.go
+++ b/prometheus/vec.go
@@ -207,7 +207,7 @@ func (m *metricVec) Reset() {
 }
 
 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
 	}
 
@@ -220,7 +220,7 @@ func (m *metricVec) hashLabelValues(vals []string) (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
 	}