From eeec6e01ec2bf626f60bbeb5b87b1dc33318f817 Mon Sep 17 00:00:00 2001 From: Michael Snowden Date: Sat, 10 Jun 2023 21:01:15 -0700 Subject: [PATCH] Get rid of MetricName type (#4479) --- common/metrics/defs.go | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/common/metrics/defs.go b/common/metrics/defs.go index 8a653a430d3..92e51c990a1 100644 --- a/common/metrics/defs.go +++ b/common/metrics/defs.go @@ -27,15 +27,12 @@ package metrics // types used/defined by the package type ( - // MetricName is the name of the metric - MetricName string - MetricUnit string // metricDefinition contains the definition for a metric metricDefinition struct { - metricName MetricName // metric name - unit MetricUnit + name string + unit MetricUnit } ) @@ -47,18 +44,8 @@ const ( Bytes = "By" ) -// Empty returns true if the metricName is an empty string -func (mn MetricName) Empty() bool { - return mn == "" -} - -// String returns string representation of this metric name -func (mn MetricName) String() string { - return string(mn) -} - func (md metricDefinition) GetMetricName() string { - return md.metricName.String() + return md.name } func (md metricDefinition) GetMetricUnit() MetricUnit { @@ -66,21 +53,21 @@ func (md metricDefinition) GetMetricUnit() MetricUnit { } func NewTimerDef(name string) metricDefinition { - return metricDefinition{metricName: MetricName(name), unit: Milliseconds} + return metricDefinition{name: name, unit: Milliseconds} } func NewBytesHistogramDef(name string) metricDefinition { - return metricDefinition{metricName: MetricName(name), unit: Bytes} + return metricDefinition{name: name, unit: Bytes} } func NewDimensionlessHistogramDef(name string) metricDefinition { - return metricDefinition{metricName: MetricName(name), unit: Dimensionless} + return metricDefinition{name: name, unit: Dimensionless} } func NewCounterDef(name string) metricDefinition { - return metricDefinition{metricName: MetricName(name)} + return metricDefinition{name: name} } func NewGaugeDef(name string) metricDefinition { - return metricDefinition{metricName: MetricName(name)} + return metricDefinition{name: name} }