Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change queued processor/exporterhelper tests to use the new metrics internal structs #1687

Merged
merged 1 commit into from
Aug 31, 2020
Merged

Change queued processor/exporterhelper tests to use the new metrics internal structs #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions exporter/exporterhelper/metricshelper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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)))
Expand All @@ -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) {
Expand Down Expand Up @@ -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.
Expand All @@ -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)))
}
}

Expand Down
9 changes: 4 additions & 5 deletions processor/queuedprocessor/queued_processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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")))
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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))
})
Expand Down