Move export test package to SDK (#962)

* Move export test package to SDK

* Rename package to metrictest

Follow Go std lib conventions in test package naming.

* Update import paths

exporters/otlp/internal/transform/metric_test.go

@@ -30,9 +30,9 @@ import (
 	"go.opentelemetry.io/otel/api/label"
 	"go.opentelemetry.io/otel/api/metric"
 	"go.opentelemetry.io/otel/api/unit"
-	"go.opentelemetry.io/otel/exporters/metric/test"
 	export "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount"
 	sumAgg "go.opentelemetry.io/otel/sdk/metric/aggregator/sum"
 )
@@ -92,7 +92,7 @@ func TestStringKeyValues(t *testing.T) {
 }
 
 func TestMinMaxSumCountValue(t *testing.T) {
-	mmsc, ckpt := test.Unslice2(minmaxsumcount.New(2, &metric.Descriptor{}))
+	mmsc, ckpt := metrictest.Unslice2(minmaxsumcount.New(2, &metric.Descriptor{}))
 
 	assert.NoError(t, mmsc.Update(context.Background(), 1, &metric.Descriptor{}))
 	assert.NoError(t, mmsc.Update(context.Background(), 10, &metric.Descriptor{}))
@@ -153,7 +153,7 @@ func TestMinMaxSumCountMetricDescriptor(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	mmsc, ckpt := test.Unslice2(minmaxsumcount.New(2, &metric.Descriptor{}))
+	mmsc, ckpt := metrictest.Unslice2(minmaxsumcount.New(2, &metric.Descriptor{}))
 	if !assert.NoError(t, mmsc.Update(ctx, 1, &metric.Descriptor{})) {
 		return
 	}
@@ -174,7 +174,7 @@ func TestMinMaxSumCountMetricDescriptor(t *testing.T) {
 func TestMinMaxSumCountDatapoints(t *testing.T) {
 	desc := metric.NewDescriptor("", metric.ValueRecorderKind, metric.Int64NumberKind)
 	labels := label.NewSet()
-	mmsc, ckpt := test.Unslice2(minmaxsumcount.New(2, &desc))
+	mmsc, ckpt := metrictest.Unslice2(minmaxsumcount.New(2, &desc))
 
 	assert.NoError(t, mmsc.Update(context.Background(), 1, &desc))
 	assert.NoError(t, mmsc.Update(context.Background(), 10, &desc))
@@ -275,7 +275,7 @@ func TestSumMetricDescriptor(t *testing.T) {
 func TestSumInt64DataPoints(t *testing.T) {
 	desc := metric.NewDescriptor("", metric.ValueRecorderKind, metric.Int64NumberKind)
 	labels := label.NewSet()
-	s, ckpt := test.Unslice2(sumAgg.New(2))
+	s, ckpt := metrictest.Unslice2(sumAgg.New(2))
 	assert.NoError(t, s.Update(context.Background(), metric.Number(1), &desc))
 	require.NoError(t, s.SynchronizedMove(ckpt, &desc))
 	record := export.NewRecord(&desc, &labels, nil, ckpt.Aggregation(), intervalStart, intervalEnd)
@@ -294,7 +294,7 @@ func TestSumInt64DataPoints(t *testing.T) {
 func TestSumFloat64DataPoints(t *testing.T) {
 	desc := metric.NewDescriptor("", metric.ValueRecorderKind, metric.Float64NumberKind)
 	labels := label.NewSet()
-	s, ckpt := test.Unslice2(sumAgg.New(2))
+	s, ckpt := metrictest.Unslice2(sumAgg.New(2))
 	assert.NoError(t, s.Update(context.Background(), metric.NewFloat64Number(1), &desc))
 	require.NoError(t, s.SynchronizedMove(ckpt, &desc))
 	record := export.NewRecord(&desc, &labels, nil, ckpt.Aggregation(), intervalStart, intervalEnd)

exporters/otlp/otlp_metric_test.go

@@ -31,9 +31,9 @@ import (
 	"go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/label"
 	"go.opentelemetry.io/otel/api/metric"
-	"go.opentelemetry.io/otel/exporters/metric/test"
 	metricsdk "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/sum"
 	"go.opentelemetry.io/otel/sdk/resource"
@@ -689,9 +689,9 @@ func runMetricExportTest(t *testing.T, exp *Exporter, rs []record, expected []me
 		var agg, ckpt metricsdk.Aggregator
 		switch r.mKind {
 		case metric.CounterKind:
-			agg, ckpt = test.Unslice2(sum.New(2))
+			agg, ckpt = metrictest.Unslice2(sum.New(2))
 		default:
-			agg, ckpt = test.Unslice2(minmaxsumcount.New(2, &desc))
+			agg, ckpt = metrictest.Unslice2(minmaxsumcount.New(2, &desc))
 		}
 
 		ctx := context.Background()

exporters/stdout/metric_test.go

@@ -28,10 +28,10 @@ import (
 
 	"go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/metric"
-	"go.opentelemetry.io/otel/exporters/metric/test"
 	"go.opentelemetry.io/otel/exporters/stdout"
 	export "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/array"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/ddsketch"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue"
@@ -96,12 +96,12 @@ func TestStdoutTimestamp(t *testing.T) {
 
 	before := time.Now()
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	ctx := context.Background()
 	desc := metric.NewDescriptor("test.name", metric.ValueObserverKind, metric.Int64NumberKind)
 
-	lvagg, ckpt := test.Unslice2(lastvalue.New(2))
+	lvagg, ckpt := metrictest.Unslice2(lastvalue.New(2))
 
 	aggtest.CheckedUpdate(t, lvagg, metric.NewInt64Number(321), &desc)
 	require.NoError(t, lvagg.SynchronizedMove(ckpt, &desc))
@@ -136,11 +136,11 @@ func TestStdoutTimestamp(t *testing.T) {
 func TestStdoutCounterFormat(t *testing.T) {
 	fix := newFixture(t)
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	desc := metric.NewDescriptor("test.name", metric.CounterKind, metric.Int64NumberKind)
 
-	cagg, ckpt := test.Unslice2(sum.New(2))
+	cagg, ckpt := metrictest.Unslice2(sum.New(2))
 
 	aggtest.CheckedUpdate(fix.t, cagg, metric.NewInt64Number(123), &desc)
 	require.NoError(t, cagg.SynchronizedMove(ckpt, &desc))
@@ -155,10 +155,10 @@ func TestStdoutCounterFormat(t *testing.T) {
 func TestStdoutLastValueFormat(t *testing.T) {
 	fix := newFixture(t)
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	desc := metric.NewDescriptor("test.name", metric.ValueObserverKind, metric.Float64NumberKind)
-	lvagg, ckpt := test.Unslice2(lastvalue.New(2))
+	lvagg, ckpt := metrictest.Unslice2(lastvalue.New(2))
 
 	aggtest.CheckedUpdate(fix.t, lvagg, metric.NewFloat64Number(123.456), &desc)
 	require.NoError(t, lvagg.SynchronizedMove(ckpt, &desc))
@@ -173,11 +173,11 @@ func TestStdoutLastValueFormat(t *testing.T) {
 func TestStdoutMinMaxSumCount(t *testing.T) {
 	fix := newFixture(t)
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	desc := metric.NewDescriptor("test.name", metric.ValueRecorderKind, metric.Float64NumberKind)
 
-	magg, ckpt := test.Unslice2(minmaxsumcount.New(2, &desc))
+	magg, ckpt := metrictest.Unslice2(minmaxsumcount.New(2, &desc))
 
 	aggtest.CheckedUpdate(fix.t, magg, metric.NewFloat64Number(123.456), &desc)
 	aggtest.CheckedUpdate(fix.t, magg, metric.NewFloat64Number(876.543), &desc)
@@ -193,10 +193,10 @@ func TestStdoutMinMaxSumCount(t *testing.T) {
 func TestStdoutValueRecorderFormat(t *testing.T) {
 	fix := newFixture(t, stdout.WithPrettyPrint())
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	desc := metric.NewDescriptor("test.name", metric.ValueRecorderKind, metric.Float64NumberKind)
-	aagg, ckpt := test.Unslice2(array.New(2))
+	aagg, ckpt := metrictest.Unslice2(array.New(2))
 
 	for i := 0; i < 1000; i++ {
 		aggtest.CheckedUpdate(fix.t, aagg, metric.NewFloat64Number(float64(i)+0.5), &desc)
@@ -242,7 +242,7 @@ func TestStdoutNoData(t *testing.T) {
 
 			fix := newFixture(t)
 
-			checkpointSet := test.NewCheckpointSet(testResource)
+			checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 			require.NoError(t, agg.SynchronizedMove(ckpt, &desc))
 
@@ -254,18 +254,18 @@ func TestStdoutNoData(t *testing.T) {
 		})
 	}
 
-	runTwoAggs(test.Unslice2(ddsketch.New(2, &desc, ddsketch.NewDefaultConfig())))
-	runTwoAggs(test.Unslice2(minmaxsumcount.New(2, &desc)))
+	runTwoAggs(metrictest.Unslice2(ddsketch.New(2, &desc, ddsketch.NewDefaultConfig())))
+	runTwoAggs(metrictest.Unslice2(minmaxsumcount.New(2, &desc)))
 }
 
 func TestStdoutLastValueNotSet(t *testing.T) {
 	fix := newFixture(t)
 
-	checkpointSet := test.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	desc := metric.NewDescriptor("test.name", metric.ValueObserverKind, metric.Float64NumberKind)
 
-	lvagg, ckpt := test.Unslice2(lastvalue.New(2))
+	lvagg, ckpt := metrictest.Unslice2(lastvalue.New(2))
 	require.NoError(t, lvagg.SynchronizedMove(ckpt, &desc))
 
 	checkpointSet.Add(&desc, lvagg, kv.String("A", "B"), kv.String("C", "D"))
@@ -312,10 +312,10 @@ func TestStdoutResource(t *testing.T) {
 	for _, tc := range testCases {
 		fix := newFixture(t)
 
-		checkpointSet := test.NewCheckpointSet(tc.res)
+		checkpointSet := metrictest.NewCheckpointSet(tc.res)
 
 		desc := metric.NewDescriptor("test.name", metric.ValueObserverKind, metric.Float64NumberKind)
-		lvagg, ckpt := test.Unslice2(lastvalue.New(2))
+		lvagg, ckpt := metrictest.Unslice2(lastvalue.New(2))
 
 		aggtest.CheckedUpdate(fix.t, lvagg, metric.NewFloat64Number(123.456), &desc)
 		require.NoError(t, lvagg.SynchronizedMove(ckpt, &desc))

exporters/metric/test/test.go → sdk/export/metric/metrictest/test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package test
+package metrictest // import "go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 
 import (
 	"context"

exporters/metric/test/test_test.go → sdk/export/metric/metrictest/test_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package test
+package metrictest
 
 import (
 	"testing"

sdk/metric/controller/push/push_test.go

@@ -28,9 +28,9 @@ import (
 	"go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/label"
 	"go.opentelemetry.io/otel/api/metric"
-	exporterTest "go.opentelemetry.io/otel/exporters/metric/test"
 	export "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 	"go.opentelemetry.io/otel/sdk/metric/controller/push"
 	controllerTest "go.opentelemetry.io/otel/sdk/metric/controller/test"
 	"go.opentelemetry.io/otel/sdk/metric/processor/test"
@@ -75,12 +75,12 @@ type testExporter struct {
 }
 
 type testFixture struct {
-	checkpointSet *exporterTest.CheckpointSet
+	checkpointSet *metrictest.CheckpointSet
 	exporter      *testExporter
 }
 
 func newFixture(t *testing.T) testFixture {
-	checkpointSet := exporterTest.NewCheckpointSet(testResource)
+	checkpointSet := metrictest.NewCheckpointSet(testResource)
 
 	exporter := &testExporter{
 		t: t,

sdk/metric/processor/basic/basic_test.go

@@ -26,9 +26,9 @@ import (
 	"go.opentelemetry.io/otel/api/kv"
 	"go.opentelemetry.io/otel/api/label"
 	"go.opentelemetry.io/otel/api/metric"
-	exportTest "go.opentelemetry.io/otel/exporters/metric/test"
 	export "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/array"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/ddsketch"
 	"go.opentelemetry.io/otel/sdk/metric/aggregator/histogram"
@@ -315,7 +315,7 @@ func TestBasicInconsistent(t *testing.T) {
 	b = basic.New(test.AggregatorSelector(), export.PassThroughExporter)
 
 	desc := metric.NewDescriptor("inst", metric.CounterKind, metric.Int64NumberKind)
-	accum := export.NewAccumulation(&desc, label.EmptySet(), resource.Empty(), exportTest.NoopAggregator{})
+	accum := export.NewAccumulation(&desc, label.EmptySet(), resource.Empty(), metrictest.NoopAggregator{})
 	require.Equal(t, basic.ErrInconsistentState, b.Process(accum))
 
 	// Test invalid kind:
@@ -338,7 +338,7 @@ func TestBasicTimestamps(t *testing.T) {
 	afterNew := time.Now()
 
 	desc := metric.NewDescriptor("inst", metric.CounterKind, metric.Int64NumberKind)
-	accum := export.NewAccumulation(&desc, label.EmptySet(), resource.Empty(), exportTest.NoopAggregator{})
+	accum := export.NewAccumulation(&desc, label.EmptySet(), resource.Empty(), metrictest.NoopAggregator{})
 
 	b.StartCollection()
 	_ = b.Process(accum)