Use AggregationSelector instead of inline func type

open-telemetry · Jun 17, 2022 · 636ccb8 · 636ccb8
1 parent ba5f080
commit 636ccb8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/sdk/metric/config_test.go b/sdk/metric/config_test.go
@@ -33,7 +33,7 @@ import (
 type reader struct {
 	producer        producer
 	temporalityFunc func(InstrumentKind) Temporality
-	aggregationFunc func(InstrumentKind) aggregation.Aggregation
+	aggregationFunc AggregationSelector
 	collectFunc     func(context.Context) (export.Metrics, error)
 	forceFlushFunc  func(context.Context) error
 	shutdownFunc    func(context.Context) error

diff --git a/sdk/metric/manual_reader.go b/sdk/metric/manual_reader.go
@@ -35,7 +35,7 @@ type manualReader struct {
 	shutdownOnce sync.Once
 
 	temporalitySelector func(InstrumentKind) Temporality
-	aggregationSelector func(InstrumentKind) aggregation.Aggregation
+	aggregationSelector AggregationSelector
 }
 
 // Compile time check the manualReader implements Reader.
@@ -46,6 +46,7 @@ func NewManualReader(opts ...ManualReaderOption) Reader {
 	cfg := newManualReaderConfig(opts)
 	return &manualReader{
 		temporalitySelector: cfg.temporalitySelector,
+		aggregationSelector: cfg.aggregationSelector,
 	}
 }
 
@@ -110,7 +111,7 @@ func (mr *manualReader) Collect(ctx context.Context) (export.Metrics, error) {
 // manualReaderConfig contains configuration options for a ManualReader.
 type manualReaderConfig struct {
 	temporalitySelector func(InstrumentKind) Temporality
-	aggregationSelector func(InstrumentKind) aggregation.Aggregation
+	aggregationSelector AggregationSelector
 }
 
 // newManualReaderConfig returns a manualReaderConfig configured with options.

diff --git a/sdk/metric/periodic_reader.go b/sdk/metric/periodic_reader.go
@@ -41,7 +41,7 @@ type periodicReaderConfig struct {
 	interval            time.Duration
 	timeout             time.Duration
 	temporalitySelector func(InstrumentKind) Temporality
-	aggregationSelector func(InstrumentKind) aggregation.Aggregation
+	aggregationSelector AggregationSelector
 }
 
 // newPeriodicReaderConfig returns a periodicReaderConfig configured with
@@ -120,6 +120,7 @@ func NewPeriodicReader(exporter Exporter, options ...PeriodicReaderOption) Reade
 		cancel:   cancel,
 
 		temporalitySelector: conf.temporalitySelector,
+		aggregationSelector: conf.aggregationSelector,
 	}
 
 	r.wg.Add(1)
@@ -140,7 +141,7 @@ type periodicReader struct {
 	exporter Exporter
 
 	temporalitySelector func(InstrumentKind) Temporality
-	aggregationSelector func(InstrumentKind) aggregation.Aggregation
+	aggregationSelector AggregationSelector
 
 	wg           sync.WaitGroup
 	cancel       context.CancelFunc

diff --git a/sdk/metric/reader.go b/sdk/metric/reader.go
@@ -178,7 +178,7 @@ func WithAggregationSelector(selector AggregationSelector) ReaderOption {
 }
 
 type aggregationSelectorOption struct {
-	selector func(InstrumentKind) aggregation.Aggregation
+	selector AggregationSelector
 }
 
 // applyManual returns a manualReaderConfig with option applied.