move temporality to export/temporality (#3017)

* move temporality to export/temporality * fix lint errors Co-authored-by: Tyler Yahn <[email protected]>
open-telemetry · Jul 14, 2022 · 3c344c7 · 3c344c7
1 parent 5f34247
commit 3c344c7
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 62 deletions.
diff --git a/sdk/metric/config_test.go b/sdk/metric/config_test.go
@@ -32,7 +32,7 @@ import (
 
 type reader struct {
 	producer        producer
-	temporalityFunc func(InstrumentKind) Temporality
+	temporalityFunc func(InstrumentKind) export.Temporality
 	aggregationFunc AggregationSelector
 	collectFunc     func(context.Context) (export.ResourceMetrics, error)
 	forceFlushFunc  func(context.Context) error
@@ -45,8 +45,8 @@ func (r *reader) aggregation(kind InstrumentKind) aggregation.Aggregation { // n
 	return r.aggregationFunc(kind)
 }
 
-func (r *reader) register(p producer)                         { r.producer = p }
-func (r *reader) temporality(kind InstrumentKind) Temporality { return r.temporalityFunc(kind) }
+func (r *reader) register(p producer)                                { r.producer = p }
+func (r *reader) temporality(kind InstrumentKind) export.Temporality { return r.temporalityFunc(kind) }
 func (r *reader) Collect(ctx context.Context) (export.ResourceMetrics, error) {
 	return r.collectFunc(ctx)
 }

diff --git a/sdk/metric/manual_reader.go b/sdk/metric/manual_reader.go
@@ -34,7 +34,7 @@ type manualReader struct {
 	producer     atomic.Value
 	shutdownOnce sync.Once
 
-	temporalitySelector func(InstrumentKind) Temporality
+	temporalitySelector func(InstrumentKind) export.Temporality
 	aggregationSelector AggregationSelector
 }
 
@@ -61,7 +61,7 @@ func (mr *manualReader) register(p producer) {
 }
 
 // temporality reports the Temporality for the instrument kind provided.
-func (mr *manualReader) temporality(kind InstrumentKind) Temporality {
+func (mr *manualReader) temporality(kind InstrumentKind) export.Temporality {
 	return mr.temporalitySelector(kind)
 }
 
@@ -111,7 +111,7 @@ func (mr *manualReader) Collect(ctx context.Context) (export.ResourceMetrics, er
 
 // manualReaderConfig contains configuration options for a ManualReader.
 type manualReaderConfig struct {
-	temporalitySelector func(InstrumentKind) Temporality
+	temporalitySelector func(InstrumentKind) export.Temporality
 	aggregationSelector AggregationSelector
 }
 

diff --git a/sdk/metric/manual_reader_test.go b/sdk/metric/manual_reader_test.go
@@ -22,6 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
+
+	"go.opentelemetry.io/otel/sdk/metric/export"
 )
 
 func TestManualReader(t *testing.T) {
@@ -32,35 +34,35 @@ func BenchmarkManualReader(b *testing.B) {
 	b.Run("Collect", benchReaderCollectFunc(NewManualReader()))
 }
 
-var deltaTemporalitySelector = func(InstrumentKind) Temporality { return DeltaTemporality }
-var cumulativeTemporalitySelector = func(InstrumentKind) Temporality { return CumulativeTemporality }
+var deltaTemporalitySelector = func(InstrumentKind) export.Temporality { return export.DeltaTemporality }
+var cumulativeTemporalitySelector = func(InstrumentKind) export.Temporality { return export.CumulativeTemporality }
 
 func TestManualReaderTemporality(t *testing.T) {
 	tests := []struct {
 		name    string
 		options []ManualReaderOption
 		// Currently only testing constant temporality. This should be expanded
 		// if we put more advanced selection in the SDK
-		wantTemporality Temporality
+		wantTemporality export.Temporality
 	}{
 		{
 			name:            "default",
-			wantTemporality: CumulativeTemporality,
+			wantTemporality: export.CumulativeTemporality,
 		},
 		{
 			name: "delta",
 			options: []ManualReaderOption{
 				WithTemporalitySelector(deltaTemporalitySelector),
 			},
-			wantTemporality: DeltaTemporality,
+			wantTemporality: export.DeltaTemporality,
 		},
 		{
 			name: "repeats overwrite",
 			options: []ManualReaderOption{
 				WithTemporalitySelector(deltaTemporalitySelector),
 				WithTemporalitySelector(cumulativeTemporalitySelector),
 			},
-			wantTemporality: CumulativeTemporality,
+			wantTemporality: export.CumulativeTemporality,
 		},
 	}
 

diff --git a/sdk/metric/periodic_reader.go b/sdk/metric/periodic_reader.go
@@ -40,7 +40,7 @@ const (
 type periodicReaderConfig struct {
 	interval            time.Duration
 	timeout             time.Duration
-	temporalitySelector func(InstrumentKind) Temporality
+	temporalitySelector func(InstrumentKind) export.Temporality
 	aggregationSelector AggregationSelector
 }
 
@@ -140,7 +140,7 @@ type periodicReader struct {
 	timeout  time.Duration
 	exporter Exporter
 
-	temporalitySelector func(InstrumentKind) Temporality
+	temporalitySelector func(InstrumentKind) export.Temporality
 	aggregationSelector AggregationSelector
 
 	wg           sync.WaitGroup
@@ -185,7 +185,7 @@ func (r *periodicReader) register(p producer) {
 }
 
 // temporality reports the Temporality for the instrument kind provided.
-func (r *periodicReader) temporality(kind InstrumentKind) Temporality {
+func (r *periodicReader) temporality(kind InstrumentKind) export.Temporality {
 	return r.temporalitySelector(kind)
 }
 

diff --git a/sdk/metric/periodic_reader_test.go b/sdk/metric/periodic_reader_test.go
@@ -191,26 +191,26 @@ func TestPeriodiclReaderTemporality(t *testing.T) {
 		options []PeriodicReaderOption
 		// Currently only testing constant temporality. This should be expanded
 		// if we put more advanced selection in the SDK
-		wantTemporality Temporality
+		wantTemporality export.Temporality
 	}{
 		{
 			name:            "default",
-			wantTemporality: CumulativeTemporality,
+			wantTemporality: export.CumulativeTemporality,
 		},
 		{
 			name: "delta",
 			options: []PeriodicReaderOption{
 				WithTemporalitySelector(deltaTemporalitySelector),
 			},
-			wantTemporality: DeltaTemporality,
+			wantTemporality: export.DeltaTemporality,
 		},
 		{
 			name: "repeats overwrite",
 			options: []PeriodicReaderOption{
 				WithTemporalitySelector(deltaTemporalitySelector),
 				WithTemporalitySelector(cumulativeTemporalitySelector),
 			},
-			wantTemporality: CumulativeTemporality,
+			wantTemporality: export.CumulativeTemporality,
 		},
 	}
 

diff --git a/sdk/metric/reader.go b/sdk/metric/reader.go
@@ -58,7 +58,7 @@ type Reader interface {
 	register(producer)
 
 	// temporality reports the Temporality for the instrument kind provided.
-	temporality(InstrumentKind) Temporality
+	temporality(InstrumentKind) export.Temporality
 
 	// aggregation returns what Aggregation to use for an instrument kind.
 	aggregation(InstrumentKind) aggregation.Aggregation // nolint:revive  // import-shadow for method scoped by type.
@@ -118,13 +118,13 @@ type ReaderOption interface {
 }
 
 // TemporalitySelector selects the temporality to use based on the InstrumentKind.
-type TemporalitySelector func(InstrumentKind) Temporality
+type TemporalitySelector func(InstrumentKind) export.Temporality
 
 // DefaultTemporalitySelector is the default TemporalitySelector used if
 // WithTemporalitySelector is not provided. CumulativeTemporality will be used
 // for all instrument kinds if this TemporalitySelector is used.
-func DefaultTemporalitySelector(InstrumentKind) Temporality {
-	return CumulativeTemporality
+func DefaultTemporalitySelector(InstrumentKind) export.Temporality {
+	return export.CumulativeTemporality
 }
 
 // WithTemporalitySelector sets the TemporalitySelector a reader will use to
@@ -135,7 +135,7 @@ func WithTemporalitySelector(selector TemporalitySelector) ReaderOption {
 }
 
 type temporalitySelectorOption struct {
-	selector func(instrument InstrumentKind) Temporality
+	selector func(instrument InstrumentKind) export.Temporality
 }
 
 // applyManual returns a manualReaderConfig with option applied.

diff --git a/sdk/metric/reader_test.go b/sdk/metric/reader_test.go
@@ -210,6 +210,6 @@ func TestDefaultTemporalitySelector(t *testing.T) {
 		AsyncUpDownCounter,
 		AsyncGauge,
 	} {
-		assert.Equal(t, CumulativeTemporality, DefaultTemporalitySelector(ik))
+		assert.Equal(t, export.CumulativeTemporality, DefaultTemporalitySelector(ik))
 	}
 }
diff --git a/sdk/metric/temporality.go b/sdk/metric/temporality.go