From fde007f9dcea81c96f5ace4bd47bf25e09356515 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sun, 30 Aug 2020 13:16:17 -0700 Subject: [PATCH] Change opencensus recv/exp to use the new metrics internal structs Signed-off-by: Bogdan Drutu --- exporter/opencensusexporter/opencensus_test.go | 15 +++++++-------- .../ocmetrics/opencensus_test.go | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 75135e0f0d0..54ca16aba26 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -30,7 +30,6 @@ import ( "go.opentelemetry.io/collector/consumer/pdatautil" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/internal/data/testdata" - "go.opentelemetry.io/collector/internal/dataold/testdataold" "go.opentelemetry.io/collector/receiver/opencensusreceiver" "go.opentelemetry.io/collector/testutil" ) @@ -166,19 +165,19 @@ func TestSendMetrics(t *testing.T) { assert.NoError(t, exp.Shutdown(context.Background())) }) - md := testdataold.GenerateMetricDataOneMetric() - assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + md := testdata.GenerateMetricsOneMetric() + assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) testutil.WaitFor(t, func() bool { return len(sink.AllMetrics()) == 1 }) metrics := sink.AllMetrics() require.Len(t, metrics, 1) - assert.Equal(t, md, pdatautil.MetricsToOldInternalMetrics(metrics[0])) + assert.Equal(t, md, pdatautil.MetricsToInternalMetrics(metrics[0])) // Sending data no node. sink.Reset() pdata.NewResource().CopyTo(md.ResourceMetrics().At(0).Resource()) - assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + assert.NoError(t, exp.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) testutil.WaitFor(t, func() bool { return len(sink.AllMetrics()) == 1 }) @@ -186,7 +185,7 @@ func TestSendMetrics(t *testing.T) { require.Len(t, metrics, 1) // The conversion will initialize the Resource md.ResourceMetrics().At(0).Resource().InitEmpty() - assert.Equal(t, md, pdatautil.MetricsToOldInternalMetrics(metrics[0])) + assert.Equal(t, md, pdatautil.MetricsToInternalMetrics(metrics[0])) } func TestSendMetrics_NoBackend(t *testing.T) { @@ -207,7 +206,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { assert.NoError(t, exp.Shutdown(context.Background())) }) - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataOneMetric()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsOneMetric()) for i := 0; i < 10000; i++ { assert.Error(t, exp.ConsumeMetrics(context.Background(), md)) } @@ -229,6 +228,6 @@ func TestSendMetrics_AfterStop(t *testing.T) { require.NoError(t, exp.Start(context.Background(), host)) assert.NoError(t, exp.Shutdown(context.Background())) - md := pdatautil.MetricsFromOldInternalMetrics(testdataold.GenerateMetricDataOneMetric()) + md := pdatautil.MetricsFromInternalMetrics(testdata.GenerateMetricsOneMetric()) assert.Error(t, exp.ConsumeMetrics(context.Background(), md)) } diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/ocmetrics/opencensus_test.go index 28334c47f9b..a7689b6249e 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus_test.go @@ -42,7 +42,7 @@ import ( "go.opentelemetry.io/collector/consumer/pdatautil" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/opencensusexporter" - "go.opentelemetry.io/collector/internal/dataold/testdataold" + "go.opentelemetry.io/collector/internal/data/testdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/testutil" ) @@ -68,15 +68,15 @@ func TestReceiver_endToEnd(t *testing.T) { require.NoError(t, oce.Shutdown(context.Background())) }() - md := testdataold.GenerateMetricDataOneMetric() - assert.NoError(t, oce.ConsumeMetrics(context.Background(), pdatautil.MetricsFromOldInternalMetrics(md))) + md := testdata.GenerateMetricsOneMetric() + assert.NoError(t, oce.ConsumeMetrics(context.Background(), pdatautil.MetricsFromInternalMetrics(md))) testutil.WaitFor(t, func() bool { return len(metricSink.AllMetrics()) != 0 }) gotMetrics := metricSink.AllMetrics() require.Len(t, gotMetrics, 1) - gotMd := pdatautil.MetricsToOldInternalMetrics(gotMetrics[0]) + gotMd := pdatautil.MetricsToInternalMetrics(gotMetrics[0]) assert.Equal(t, md, gotMd) }