start adding support for units

Signed-off-by: Arianna Vespri <[email protected]>

Author: vesari

go.mod

@@ -30,3 +30,7 @@ require (
 )
 
 exclude github.com/prometheus/client_golang v1.12.1
+
+replace github.com/prometheus/common => github.com/vesari/common v0.0.0-20231121140958-784d3aad4c30
+
+replace github.com/prometheus/client_model => github.com/vesari/client_model v0.0.0-20231118150741-19723af61627

go.sum

@@ -33,17 +33,17 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
-github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/vesari/client_model v0.0.0-20231118150741-19723af61627 h1:pJsecGZFkJIN3ipp7fS8hLDK0Dcnk2JVxXds3Dev3dQ=
+github.com/vesari/client_model v0.0.0-20231118150741-19723af61627/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/vesari/common v0.0.0-20231121140958-784d3aad4c30 h1:WaoSRlUM9CilXfZwJ5WIsFJKLnwJ6/WZjyT1oiiRO7s=
+github.com/vesari/common v0.0.0-20231121140958-784d3aad4c30/go.mod h1:F2CatmaM24xsPNg4EqskJKMF+Tl27WbRF+Exgus+vOw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=

prometheus/build_info_collector.go

@@ -30,6 +30,7 @@ func NewBuildInfoCollector() Collector {
 		NewDesc(
 			"go_build_info",
 			"Build information about the main Go module.",
+			"",
 			nil, Labels{"path": path, "version": version, "checksum": sum},
 		),
 		GaugeValue, 1)}

prometheus/collectors/dbstats_collector.go

@@ -46,46 +46,55 @@ func NewDBStatsCollector(db *sql.DB, dbName string) prometheus.Collector {
 		maxOpenConnections: prometheus.NewDesc(
 			fqName("max_open_connections"),
 			"Maximum number of open connections to the database.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		openConnections: prometheus.NewDesc(
 			fqName("open_connections"),
 			"The number of established connections both in use and idle.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		inUseConnections: prometheus.NewDesc(
 			fqName("in_use_connections"),
 			"The number of connections currently in use.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		idleConnections: prometheus.NewDesc(
 			fqName("idle_connections"),
 			"The number of idle connections.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		waitCount: prometheus.NewDesc(
 			fqName("wait_count_total"),
 			"The total number of connections waited for.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		waitDuration: prometheus.NewDesc(
 			fqName("wait_duration_seconds_total"),
 			"The total time blocked waiting for a new connection.",
+			"seconds",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		maxIdleClosed: prometheus.NewDesc(
 			fqName("max_idle_closed_total"),
 			"The total number of connections closed due to SetMaxIdleConns.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		maxIdleTimeClosed: prometheus.NewDesc(
 			fqName("max_idle_time_closed_total"),
 			"The total number of connections closed due to SetConnMaxIdleTime.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 		maxLifetimeClosed: prometheus.NewDesc(
 			fqName("max_lifetime_closed_total"),
 			"The total number of connections closed due to SetConnMaxLifetime.",
+			"",
 			nil, prometheus.Labels{"db_name": dbName},
 		),
 	}

prometheus/counter.go

@@ -88,6 +88,7 @@ func NewCounter(opts CounterOpts) Counter {
 	desc := NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		nil,
 		opts.ConstLabels,
 	)
@@ -203,6 +204,7 @@ func (v2) NewCounterVec(opts CounterVecOpts) *CounterVec {
 	desc := V2.NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		opts.VariableLabels,
 		opts.ConstLabels,
 	)
@@ -352,6 +354,7 @@ func NewCounterFunc(opts CounterOpts, function func() float64) CounterFunc {
 	return newValueFunc(NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		nil,
 		opts.ConstLabels,
 	), CounterValue, function)

prometheus/desc.go

@@ -47,6 +47,8 @@ type Desc struct {
 	fqName string
 	// help provides some helpful information about this metric.
 	help string
+	// unit provides the unit of this metric.
+	unit string
 	// constLabelPairs contains precalculated DTO label pairs based on
 	// the constant labels.
 	constLabelPairs []*dto.LabelPair
@@ -75,8 +77,8 @@ type Desc struct {
 //
 // For constLabels, the label values are constant. Therefore, they are fully
 // specified in the Desc. See the Collector example for a usage pattern.
-func NewDesc(fqName, help string, variableLabels []string, constLabels Labels) *Desc {
-	return V2.NewDesc(fqName, help, UnconstrainedLabels(variableLabels), constLabels)
+func NewDesc(fqName, help string, unit string, variableLabels []string, constLabels Labels) *Desc {
+	return V2.NewDesc(fqName, help, unit, UnconstrainedLabels(variableLabels), constLabels)
 }
 
 // NewDesc allocates and initializes a new Desc. Errors are recorded in the Desc
@@ -89,10 +91,11 @@ func NewDesc(fqName, help string, variableLabels []string, constLabels Labels) *
 //
 // For constLabels, the label values are constant. Therefore, they are fully
 // specified in the Desc. See the Collector example for a usage pattern.
-func (v2) NewDesc(fqName, help string, variableLabels ConstrainableLabels, constLabels Labels) *Desc {
+func (v2) NewDesc(fqName, help string, unit string, variableLabels ConstrainableLabels, constLabels Labels) *Desc {
 	d := &Desc{
 		fqName:         fqName,
 		help:           help,
+		unit:           unit,
 		variableLabels: variableLabels.compile(),
 	}
 	if !model.IsValidMetricName(model.LabelValue(fqName)) {
@@ -149,10 +152,11 @@ func (v2) NewDesc(fqName, help string, variableLabels ConstrainableLabels, const
 	d.id = xxh.Sum64()
 	// Sort labelNames so that order doesn't matter for the hash.
 	sort.Strings(labelNames)
-	// Now hash together (in this order) the help string and the sorted
+	// Now hash together (in this order) the help string, the unit string and the sorted
 	// label names.
 	xxh.Reset()
 	xxh.WriteString(help)
+	xxh.WriteString(unit)
 	xxh.Write(separatorByteSlice)
 	for _, labelName := range labelNames {
 		xxh.WriteString(labelName)
@@ -198,9 +202,10 @@ func (d *Desc) String() string {
 		}
 	}
 	return fmt.Sprintf(
-		"Desc{fqName: %q, help: %q, constLabels: {%s}, variableLabels: {%s}}",
+		"Desc{fqName: %q, help: %q, unit: %q, constLabels: {%s}, variableLabels: {%s}}",
 		d.fqName,
 		d.help,
+		d.unit,
 		strings.Join(lpStrings, ","),
 		strings.Join(vlStrings, ","),
 	)

prometheus/desc_test.go

@@ -21,6 +21,7 @@ func TestNewDescInvalidLabelValues(t *testing.T) {
 	desc := NewDesc(
 		"sample_label",
 		"sample label",
+		"",
 		nil,
 		Labels{"a": "\xFF"},
 	)

prometheus/example_clustermanager_test.go

@@ -66,11 +66,13 @@ var (
 	oomCountDesc = prometheus.NewDesc(
 		"clustermanager_oom_crashes_total",
 		"Number of OOM crashes.",
+		"",
 		[]string{"host"}, nil,
 	)
 	ramUsageDesc = prometheus.NewDesc(
 		"clustermanager_ram_usage_bytes",
 		"RAM usage as reported to the cluster manager.",
+		"bytes",
 		[]string{"host"}, nil,
 	)
 )

prometheus/example_metricvec_test.go

@@ -52,8 +52,8 @@ type InfoVec struct {
 	*prometheus.MetricVec
 }
 
-func NewInfoVec(name, help string, labelNames []string) *InfoVec {
-	desc := prometheus.NewDesc(name, help, labelNames, nil)
+func NewInfoVec(name, help, unit string, labelNames []string) *InfoVec {
+	desc := prometheus.NewDesc(name, help, unit, labelNames, nil)
 	return &InfoVec{
 		MetricVec: prometheus.NewMetricVec(desc, func(lvs ...string) prometheus.Metric {
 			if len(lvs) != len(labelNames) {
@@ -110,6 +110,7 @@ func ExampleMetricVec() {
 	infoVec := NewInfoVec(
 		"library_version_info",
 		"Versions of the libraries used in this binary.",
+		"",
 		[]string{"library", "version"},
 	)
 

prometheus/examples_test.go

@@ -308,9 +308,9 @@ func ExampleRegister() {
 
 	// Output:
 	// taskCounter registered.
-	// taskCounterVec not registered: a previously registered descriptor with the same fully-qualified name as Desc{fqName: "worker_pool_completed_tasks_total", help: "Total number of tasks completed.", constLabels: {}, variableLabels: {worker_id}} has different label names or a different help string
+	// taskCounterVec not registered: a previously registered descriptor with the same fully-qualified name as Desc{fqName: "worker_pool_completed_tasks_total", help: "Total number of tasks completed.", unit: "", constLabels: {}, variableLabels: {worker_id}} has different label names or a different help string
 	// taskCounter unregistered.
-	// taskCounterVec not registered: a previously registered descriptor with the same fully-qualified name as Desc{fqName: "worker_pool_completed_tasks_total", help: "Total number of tasks completed.", constLabels: {}, variableLabels: {worker_id}} has different label names or a different help string
+	// taskCounterVec not registered: a previously registered descriptor with the same fully-qualified name as Desc{fqName: "worker_pool_completed_tasks_total", help: "Total number of tasks completed.", unit: "", constLabels: {}, variableLabels: {worker_id}} has different label names or a different help string
 	// taskCounterVec registered.
 	// Worker initialization failed: inconsistent label cardinality: expected 1 label values but got 2 in []string{"42", "spurious arg"}
 	// notMyCounter is nil.
@@ -382,6 +382,7 @@ func ExampleNewConstSummary() {
 	desc := prometheus.NewDesc(
 		"http_request_duration_seconds",
 		"A summary of the HTTP request durations.",
+		"seconds",
 		[]string{"code", "method"},
 		prometheus.Labels{"owner": "example"},
 	)
@@ -433,6 +434,7 @@ func ExampleNewConstHistogram() {
 	desc := prometheus.NewDesc(
 		"http_request_duration_seconds",
 		"A histogram of the HTTP request durations.",
+		"seconds",
 		[]string{"code", "method"},
 		prometheus.Labels{"owner": "example"},
 	)
@@ -460,6 +462,7 @@ func ExampleNewConstHistogram_WithExemplar() {
 	desc := prometheus.NewDesc(
 		"http_request_duration_seconds",
 		"A histogram of the HTTP request durations.",
+		"seconds",
 		[]string{"code", "method"},
 		prometheus.Labels{"owner": "example"},
 	)
@@ -630,6 +633,7 @@ func ExampleNewMetricWithTimestamp() {
 	desc := prometheus.NewDesc(
 		"temperature_kelvin",
 		"Current temperature in Kelvin.",
+		"kelvin",
 		nil, nil,
 	)
 
@@ -663,6 +667,7 @@ func ExampleNewConstMetricWithCreatedTimestamp() {
 	desc := prometheus.NewDesc(
 		"time_since_epoch_seconds",
 		"Current epoch time in seconds.",
+		"seconds",
 		nil, nil,
 	)
 

prometheus/expvar_collector_test.go

@@ -29,16 +29,19 @@ func ExampleNewExpvarCollector() {
 		"memstats": prometheus.NewDesc(
 			"expvar_memstats",
 			"All numeric memstats as one metric family. Not a good role-model, actually... ;-)",
+			"",
 			[]string{"type"}, nil,
 		),
 		"lone-int": prometheus.NewDesc(
 			"expvar_lone_int",
 			"Just an expvar int as an example.",
+			"",
 			nil, nil,
 		),
 		"http-request-map": prometheus.NewDesc(
 			"expvar_http_request_total",
 			"How many http requests processed, partitioned by status code and http method.",
+			"",
 			[]string{"code", "method"}, nil,
 		),
 	})

prometheus/gauge.go

@@ -79,6 +79,7 @@ func NewGauge(opts GaugeOpts) Gauge {
 	desc := NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		nil,
 		opts.ConstLabels,
 	)
@@ -161,6 +162,7 @@ func (v2) NewGaugeVec(opts GaugeVecOpts) *GaugeVec {
 	desc := V2.NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		opts.VariableLabels,
 		opts.ConstLabels,
 	)
@@ -305,6 +307,7 @@ func NewGaugeFunc(opts GaugeOpts, function func() float64) GaugeFunc {
 	return newValueFunc(NewDesc(
 		BuildFQName(opts.Namespace, opts.Subsystem, opts.Name),
 		opts.Help,
+		opts.Unit,
 		nil,
 		opts.ConstLabels,
 	), GaugeValue, function)

prometheus/gauge_test.go

@@ -171,7 +171,7 @@ func TestGaugeFunc(t *testing.T) {
 		func() float64 { return 3.1415 },
 	)
 
-	if expected, got := `Desc{fqName: "test_name", help: "test help", constLabels: {a="1",b="2"}, variableLabels: {}}`, gf.Desc().String(); expected != got {
+	if expected, got := `Desc{fqName: "test_name", help: "test help", unit: "", constLabels: {a="1",b="2"}, variableLabels: {}}`, gf.Desc().String(); expected != got {
 		t.Errorf("expected %q, got %q", expected, got)
 	}