Update metrics option to require a MeterProvider instead of a Reader

kralicky · Apr 10, 2023 · e5efdae · e5efdae
1 parent 4cd02ff
commit e5efdae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/metrics.go b/metrics.go
@@ -22,26 +22,7 @@ type MetricsExporter struct {
 	staticAttrs []attribute.KeyValue
 }
 
-// func (m *MetricsExporter) Inverted() *MetricsExporter {
-// 	if m == nil {
-// 		return nil
-// 	}
-// 	return &MetricsExporter{
-// 		rxBytesCollector: m.txBytesCollector,
-// 		txBytesCollector: m.rxBytesCollector,
-
-// 		rxRpcCollector: m.txRpcCollector,
-// 		txRpcCollector: m.rxRpcCollector,
-
-// 		svcRxLatencyCollector: m.svcRxLatencyCollector,
-// 		svcTxLatencyCollector: m.svcTxLatencyCollector,
-
-// 		staticAttrs: m.staticAttrs,
-// 	}
-// }
-
-func NewMetricsExporter(reader metric.Reader, staticAttrs ...attribute.KeyValue) *MetricsExporter {
-	provider := metric.NewMeterProvider(metric.WithReader(reader))
+func NewMetricsExporter(provider *metric.MeterProvider, staticAttrs ...attribute.KeyValue) *MetricsExporter {
 	meter := provider.Meter("github.com/kralicky/totem/metrics")
 
 	rxBytes, err := meter.Int64Counter("stream_receive_bytes",

diff --git a/server.go b/server.go
@@ -55,9 +55,9 @@ func WithInterceptors(config InterceptorConfig) ServerOption {
 	}
 }
 
-func WithMetrics(reader metric.Reader, staticAttrs ...attribute.KeyValue) ServerOption {
+func WithMetrics(provider *metric.MeterProvider, staticAttrs ...attribute.KeyValue) ServerOption {
 	return func(o *ServerOptions) {
-		o.metrics = NewMetricsExporter(reader, staticAttrs...)
+		o.metrics = NewMetricsExporter(provider, staticAttrs...)
 	}
 }