grpc-ecosystemgh-60 NewClientMetrics is using collectorOptions direct…

…ly so it can access buckets

client_metrics.go

@@ -20,14 +20,28 @@ type ClientMetrics struct {
 // ClientMetrics when not using the default Prometheus monitor registry, for
 // example when wanting to control which monitor are added to a registry as
 // opposed to automatically adding monitor via init functions.
-func NewClientMetrics(counterOpts ...CollectorOption) *ClientMetrics {
-	opts := counterOptions(counterOpts).apply(prom.Opts{
-		Namespace: namespace,
-		Subsystem: "client",
-	})
+func NewClientMetrics(opts ...CollectorOption) *ClientMetrics {
+	var collectorOptions collectorOptions
+	for _, fn := range opts {
+		fn(&collectorOptions)
+	}
+
+	if collectorOptions.namespace == "" {
+		collectorOptions.namespace = namespace
+	}
+	if collectorOptions.subsystem == "" {
+		collectorOptions.subsystem = "client"
+	}
 
 	return &ClientMetrics{
-		clientMonitor: initClientMonitor(opts),
+		clientMonitor: initClientMonitor(
+			prom.Opts{
+				Namespace:   collectorOptions.namespace,
+				Subsystem:   collectorOptions.subsystem,
+				ConstLabels: collectorOptions.constLabels,
+			},
+			collectorOptions.buckets,
+		),
 	}
 }
 

metric_options.go

@@ -4,19 +4,20 @@ import (
 	prom "github.com/prometheus/client_golang/prometheus"
 )
 
-type options struct {
+// CollectorOption lets you add options to monitor using With* funcs.
+type CollectorOption func(*collectorOptions)
+
+type collectorOptions struct {
 	namespace, subsystem string
 	constLabels          prom.Labels
 	buckets              []float64
 }
 
-// A CollectorOption lets you add options to monitor using With* funcs.
-type CollectorOption func(*options)
-
 type counterOptions []CollectorOption
 
+// TODO: remove once ServerMetrics is changed.
 func (co counterOptions) apply(base prom.Opts) prom.Opts {
-	var opts options
+	var opts collectorOptions
 	for _, f := range co {
 		f(&opts)
 	}
@@ -34,28 +35,28 @@ func (co counterOptions) apply(base prom.Opts) prom.Opts {
 
 // WithConstLabels allows you to add ConstLabels to Counter monitor.
 func WithConstLabels(labels prom.Labels) CollectorOption {
-	return func(o *options) {
+	return func(o *collectorOptions) {
 		o.constLabels = labels
 	}
 }
 
-// WithSubsystem allows to change default subsystem.
+// WithNamespace allows to change default subsystem.
 func WithNamespace(namespace string) CollectorOption {
-	return func(o *options) {
+	return func(o *collectorOptions) {
 		o.namespace = namespace
 	}
 }
 
 // WithSubsystem allows to change default subsystem.
 func WithSubsystem(subsystem string) CollectorOption {
-	return func(o *options) {
+	return func(o *collectorOptions) {
 		o.subsystem = subsystem
 	}
 }
 
 // WithBuckets allows you to specify custom bucket ranges for histograms.
 func WithBuckets(buckets []float64) CollectorOption {
-	return func(o *options) {
+	return func(o *collectorOptions) {
 		o.buckets = buckets
 	}
 }

monitor.go

@@ -72,7 +72,7 @@ type clientMonitor struct {
 
 var _ prometheus.Collector = &clientMonitor{}
 
-func initClientMonitor(opts prometheus.Opts) *clientMonitor {
+func initClientMonitor(opts prometheus.Opts, buckets []float64) *clientMonitor {
 	dialer := prometheus.NewCounterVec(
 		counterOpts(opts, "reconnects_total", "A total number of reconnects made by the client."),
 		[]string{"address"},
@@ -112,7 +112,7 @@ func initClientMonitor(opts prometheus.Opts) *clientMonitor {
 
 	// Histograms
 	requestDuration := prometheus.NewHistogramVec(
-		histogramOpts(opts, "request_duration_histogram_seconds", "The RPC request latencies in seconds on the client side.", nil),
+		histogramOpts(opts, "request_duration_histogram_seconds", "The RPC request latencies in seconds on the client side.", buckets),
 		[]string{labelService, labelMethod, labelCode, labelType},
 	)
 

server_metrics.go

@@ -58,8 +58,8 @@ func NewServerMetrics(counterOpts ...CollectorOption) *ServerMetrics {
 
 //// EnableHandlingTimeHistogram enables histograms being registered when
 //// registering the ServerMetrics on a Prometheus registry. Histograms can be
-//// expensive on Prometheus servers. It takes options to configure histogram
-//// options such as the defined buckets.
+//// expensive on Prometheus servers. It takes collectorOptions to configure histogram
+//// collectorOptions such as the defined buckets.
 //func (m *ServerMetrics) EnableHandlingTimeHistogram(opts ...HistogramCollectorOption) {
 //	for _, o := range opts {
 //		o(&m.serverHandledHistogramOpts)