From d2480f8618d9aed5015a42ffa6d9d3b2571354a8 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sun, 30 Aug 2020 13:30:53 -0700 Subject: [PATCH] Change queued processor/exporterhelper tests to use the new metrics internal structs Signed-off-by: Bogdan Drutu --- exporter/exporterhelper/metricshelper_test.go | 19 +++++++++---------- .../queuedprocessor/queued_processor_test.go | 9 ++++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/exporter/exporterhelper/metricshelper_test.go b/exporter/exporterhelper/metricshelper_test.go index 9a7f43ebf6c..52560819863 100644 --- a/exporter/exporterhelper/metricshelper_test.go +++ b/exporter/exporterhelper/metricshelper_test.go @@ -28,7 +28,6 @@ import ( "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/consumer/pdatautil" "go.opentelemetry.io/collector/internal/data/testdata" - "go.opentelemetry.io/collector/internal/dataold/testdataold" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) @@ -47,7 +46,7 @@ var ( ) func TestMetricsRequest(t *testing.T) { - mr := newMetricsRequest(context.Background(), pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataEmpty()), nil) + mr := newMetricsRequest(context.Background(), pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsEmpty()), nil) partialErr := consumererror.PartialTracesError(errors.New("some error"), testdata.GenerateTraceDataOneSpan()) assert.Same(t, mr, mr.onPartialError(partialErr.(consumererror.PartialError))) @@ -67,22 +66,22 @@ func TestMetricsExporter_NilPushMetricsData(t *testing.T) { } func TestMetricsExporter_Default(t *testing.T) { - md := testdataold.GenerateMetricDataEmpty() + md := testdata.GenerateMetricsEmpty() me, err := NewMetricsExporter(fakeMetricsExporterConfig, newPushMetricsData(0, nil)) assert.NotNil(t, me) assert.NoError(t, err) - assert.Nil(t, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + assert.Nil(t, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) assert.Nil(t, me.Shutdown(context.Background())) } func TestMetricsExporter_Default_ReturnError(t *testing.T) { - md := testdataold.GenerateMetricDataEmpty() + md := testdata.GenerateMetricsEmpty() want := errors.New("my_error") me, err := NewMetricsExporter(fakeMetricsExporterConfig, newPushMetricsData(0, want)) require.Nil(t, err) require.NotNil(t, me) - require.Equal(t, want, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + require.Equal(t, want, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) } func TestMetricsExporter_WithRecordMetrics(t *testing.T) { @@ -166,10 +165,10 @@ func checkRecordedMetricsForMetricsExporter(t *testing.T, me component.MetricsEx require.NoError(t, err) defer doneFn() - md := testdataold.GenerateMetricDataTwoMetrics() + md := testdata.GenerateMetricsTwoMetrics() const numBatches = 7 for i := 0; i < numBatches; i++ { - require.Equal(t, wantError, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + require.Equal(t, wantError, me.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) } // TODO: When the new metrics correctly count partial dropped fix this. @@ -182,11 +181,11 @@ func checkRecordedMetricsForMetricsExporter(t *testing.T, me component.MetricsEx } func generateMetricsTraffic(t *testing.T, me component.MetricsExporter, numRequests int, wantError error) { - md := testdataold.GenerateMetricDataOneMetricOneDataPoint() + md := testdata.GenerateMetricsOneMetricOneDataPoint() ctx, span := trace.StartSpan(context.Background(), fakeMetricsParentSpanName, trace.WithSampler(trace.AlwaysSample())) defer span.End() for i := 0; i < numRequests; i++ { - require.Equal(t, wantError, me.ConsumeMetrics(ctx, pdatautil.MetricsFromOldInternalMetrics(md))) + require.Equal(t, wantError, me.ConsumeMetrics(ctx, pdatautil.MetricsFromInternalMetrics(md))) } } diff --git a/processor/queuedprocessor/queued_processor_test.go b/processor/queuedprocessor/queued_processor_test.go index 8400ab4d94f..5a69b2dbb00 100644 --- a/processor/queuedprocessor/queued_processor_test.go +++ b/processor/queuedprocessor/queued_processor_test.go @@ -36,7 +36,6 @@ import ( "go.opentelemetry.io/collector/consumer/pdatautil" "go.opentelemetry.io/collector/internal/collector/telemetry" "go.opentelemetry.io/collector/internal/data/testdata" - "go.opentelemetry.io/collector/internal/dataold/testdataold" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/collector/processor" ) @@ -188,7 +187,7 @@ func TestMetricsQueueProcessor_NoEnqueueOnPermanentError(t *testing.T) { require.NoError(t, err) defer doneFn() - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataTwoMetrics()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsTwoMetrics()) mockP := newMockConcurrentSpanProcessor() mockP.updateError(consumererror.Permanent(errors.New("bad data"))) @@ -220,7 +219,7 @@ func TestMetricsQueueProcessor_NoEnqueueOnNoRetry(t *testing.T) { require.NoError(t, err) defer doneFn() - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataTwoMetrics()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsTwoMetrics()) mockP := newMockConcurrentSpanProcessor() mockP.updateError(errors.New("transient error")) @@ -252,7 +251,7 @@ func TestMetricsQueueProcessor_EnqueueOnError(t *testing.T) { require.NoError(t, err) defer doneFn() - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataTwoMetrics()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsTwoMetrics()) mockP := newMockConcurrentSpanProcessor() mockP.updateError(errors.New("transient error")) @@ -351,7 +350,7 @@ func TestMetricsQueueProcessorHappyPath(t *testing.T) { wantBatches := 10 wantMetricPoints := 2 * 20 for i := 0; i < wantBatches; i++ { - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataTwoMetrics()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsTwoMetrics()) mockP.run(func() { require.NoError(t, qp.ConsumeMetrics(context.Background(), md)) })