Change resource processor to use the new metrics internal structs

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Aug 30, 2020 · 0da6964 · 0da6964
1 parent 52c9e7f
commit 0da6964
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/processor/resourceprocessor/resource_processor.go b/processor/resourceprocessor/resource_processor.go
@@ -42,7 +42,7 @@ func (rp *resourceProcessor) ProcessTraces(_ context.Context, td pdata.Traces) (
 
 // ProcessMetrics implements the MProcessor interface
 func (rp *resourceProcessor) ProcessMetrics(_ context.Context, md pdata.Metrics) (pdata.Metrics, error) {
-	imd := pdatautil.MetricsToOldInternalMetrics(md)
+	imd := pdatautil.MetricsToInternalMetrics(md)
 	rms := imd.ResourceMetrics()
 	for i := 0; i < rms.Len(); i++ {
 		resource := rms.At(i).Resource()
@@ -54,5 +54,5 @@ func (rp *resourceProcessor) ProcessMetrics(_ context.Context, md pdata.Metrics)
 		}
 		rp.attrProc.Process(resource.Attributes())
 	}
-	return pdatautil.MetricsFromOldInternalMetrics(imd), nil
+	return pdatautil.MetricsFromInternalMetrics(imd), nil
 }
diff --git a/processor/resourceprocessor/resource_processor_test.go b/processor/resourceprocessor/resource_processor_test.go
@@ -26,7 +26,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/processor/processorhelper"
 )
 
@@ -147,17 +146,17 @@ func generateTraceData(attributes map[string]string) pdata.Traces {
 }
 
 func generateMetricData(attributes map[string]string) pdata.Metrics {
-	md := testdataold.GenerateMetricDataOneMetricNoResource()
+	md := testdata.GenerateMetricsOneMetricNoResource()
 	if attributes == nil {
-		return pdatautil.MetricsFromOldInternalMetrics(md)
+		return pdatautil.MetricsFromInternalMetrics(md)
 	}
 	resource := md.ResourceMetrics().At(0).Resource()
 	resource.InitEmpty()
 	for k, v := range attributes {
 		resource.Attributes().InsertString(k, v)
 	}
 	resource.Attributes().Sort()
-	return pdatautil.MetricsFromOldInternalMetrics(md)
+	return pdatautil.MetricsFromInternalMetrics(md)
 }
 
 type testTraceConsumer struct {
@@ -179,7 +178,7 @@ type testMetricsConsumer struct {
 
 func (tmn *testMetricsConsumer) ConsumeMetrics(_ context.Context, md pdata.Metrics) error {
 	// sort attributes to be able to compare traces
-	imd := pdatautil.MetricsToOldInternalMetrics(md)
+	imd := pdatautil.MetricsToInternalMetrics(md)
 	for i := 0; i < imd.ResourceMetrics().Len(); i++ {
 		sortResourceAttributes(imd.ResourceMetrics().At(i).Resource())
 	}

diff --git a/testbed/tests/resource_processor_test.go b/testbed/tests/resource_processor_test.go
@@ -24,10 +24,10 @@ import (
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/consumer/pdatautil"
+	"go.opentelemetry.io/collector/internal/data"
 	otlpcommon "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/common/v1"
-	otlpmetrics "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/metrics/v1old"
+	otlpmetrics "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/metrics/v1"
 	otlpresource "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/resource/v1"
-	"go.opentelemetry.io/collector/internal/dataold"
 	"go.opentelemetry.io/collector/testbed/testbed"
 )
 
@@ -208,7 +208,7 @@ func getResourceProcessorTestCases(t *testing.T) []resourceProcessorTestCase {
 }
 
 func getMetricDataFromResourceMetrics(rm *otlpmetrics.ResourceMetrics) pdata.Metrics {
-	return pdatautil.MetricsFromOldInternalMetrics(dataold.MetricDataFromOtlp([]*otlpmetrics.ResourceMetrics{rm}))
+	return pdatautil.MetricsFromInternalMetrics(data.MetricDataFromOtlp([]*otlpmetrics.ResourceMetrics{rm}))
 }
 
 func getMetricDataFromJSON(t *testing.T, rmString string) pdata.Metrics {
@@ -217,7 +217,7 @@ func getMetricDataFromJSON(t *testing.T, rmString string) pdata.Metrics {
 	err := jsonpb.UnmarshalString(rmString, &mockedResourceMetrics)
 	require.NoError(t, err, "failed to get mocked resource metrics object", err)
 
-	return pdatautil.MetricsFromOldInternalMetrics(dataold.MetricDataFromOtlp([]*otlpmetrics.ResourceMetrics{&mockedResourceMetrics}))
+	return pdatautil.MetricsFromInternalMetrics(data.MetricDataFromOtlp([]*otlpmetrics.ResourceMetrics{&mockedResourceMetrics}))
 }
 
 func TestMetricResourceProcessor(t *testing.T) {
@@ -280,10 +280,10 @@ func TestMetricResourceProcessor(t *testing.T) {
 
 			// Assert Resources
 			m := tc.MockBackend.ReceivedMetrics[0]
-			rm := pdatautil.MetricsToOldInternalMetrics(m).ResourceMetrics()
+			rm := pdatautil.MetricsToInternalMetrics(m).ResourceMetrics()
 			require.Equal(t, 1, rm.Len())
 
-			expectidMD := pdatautil.MetricsToOldInternalMetrics(test.expectedMetricData)
+			expectidMD := pdatautil.MetricsToInternalMetrics(test.expectedMetricData)
 			require.Equal(t,
 				attributesToMap(expectidMD.ResourceMetrics().At(0).Resource().Attributes()),
 				attributesToMap(rm.At(0).Resource().Attributes()),