diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe1ce4e19f..4c0ce1a2cbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## 🛑 Breaking changes 🛑 - Remove `consumerdata.TraceData` (#2551) +- Move `consumerdata.MetricsData` to `internaldata.MetricsData` (#2512) ## v0.21.0 Beta diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 5814c83e4f7..d758846d68b 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -29,7 +29,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/translator/internaldata" ) @@ -101,7 +100,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) { assert.NotNil(t, exp) for delta := 0; delta <= 20; delta += 10 { - md := internaldata.OCToMetrics(consumerdata.MetricsData{Metrics: metricBuilder(int64(delta))}) + md := internaldata.OCToMetrics(internaldata.MetricsData{Metrics: metricBuilder(int64(delta))}) assert.NoError(t, exp.ConsumeMetrics(context.Background(), md)) res, err := http.Get("http://localhost:7777/metrics") @@ -152,7 +151,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { assert.NotNil(t, exp) for delta := 0; delta <= 20; delta += 10 { - md := internaldata.OCToMetrics(consumerdata.MetricsData{Metrics: metricBuilder(int64(delta))}) + md := internaldata.OCToMetrics(internaldata.MetricsData{Metrics: metricBuilder(int64(delta))}) assert.NoError(t, exp.ConsumeMetrics(context.Background(), md)) res, err := http.Get("http://localhost:7777/metrics") diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index 3834c37a1cf..6ddecad637b 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -29,7 +29,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configmodels" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" @@ -333,9 +332,9 @@ func TestFilterMetricProcessor(t *testing.T) { ctx := context.Background() assert.NoError(t, fmp.Start(ctx, nil)) - mds := make([]consumerdata.MetricsData, len(test.inMN)) + mds := make([]internaldata.MetricsData, len(test.inMN)) for i, metrics := range test.inMN { - mds[i] = consumerdata.MetricsData{ + mds[i] = internaldata.MetricsData{ Metrics: metrics, } } diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus.go b/receiver/opencensusreceiver/ocmetrics/opencensus.go index d3023424451..b005724a3a6 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/translator/internaldata" ) @@ -117,7 +116,7 @@ func (ocr *Receiver) processReceivedMsg( resource = recv.Resource } - md := consumerdata.MetricsData{ + md := internaldata.MetricsData{ Node: lastNonNilNode, Resource: resource, Metrics: recv.Metrics, @@ -127,7 +126,7 @@ func (ocr *Receiver) processReceivedMsg( return lastNonNilNode, resource, err } -func (ocr *Receiver) sendToNextConsumer(longLivedRPCCtx context.Context, md consumerdata.MetricsData) error { +func (ocr *Receiver) sendToNextConsumer(longLivedRPCCtx context.Context, md internaldata.MetricsData) error { ctx := obsreport.StartMetricsReceiveOp( longLivedRPCCtx, ocr.instanceName, diff --git a/receiver/prometheusreceiver/internal/transaction.go b/receiver/prometheusreceiver/internal/transaction.go index df52ac0861e..9ebe2e7e294 100644 --- a/receiver/prometheusreceiver/internal/transaction.go +++ b/receiver/prometheusreceiver/internal/transaction.go @@ -31,7 +31,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/translator/internaldata" ) @@ -176,7 +175,7 @@ func (tr *transaction) Commit() error { numPoints := 0 if len(metrics) > 0 { - md := internaldata.OCToMetrics(consumerdata.MetricsData{ + md := internaldata.OCToMetrics(internaldata.MetricsData{ Node: tr.node, Resource: tr.resource, Metrics: metrics, diff --git a/receiver/prometheusreceiver/metrics_receiver_test.go b/receiver/prometheusreceiver/metrics_receiver_test.go index 14bfff93c6e..cabdb3852e1 100644 --- a/receiver/prometheusreceiver/metrics_receiver_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_test.go @@ -39,7 +39,6 @@ import ( "gopkg.in/yaml.v2" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/translator/internaldata" ) @@ -111,7 +110,7 @@ type testData struct { pages []mockPrometheusResponse node *commonpb.Node resource *resourcepb.Resource - validateFunc func(t *testing.T, td *testData, result []consumerdata.MetricsData) + validateFunc func(t *testing.T, td *testData, result []internaldata.MetricsData) } // setupMockPrometheus to create a mocked prometheus based on targets, returning the server and a prometheus exporting @@ -167,7 +166,7 @@ func setupMockPrometheus(tds ...*testData) (*mockPrometheus, *promcfg.Config, er return mp, pCfg, err } -func verifyNumScrapeResults(t *testing.T, td *testData, mds []consumerdata.MetricsData) { +func verifyNumScrapeResults(t *testing.T, td *testData, mds []internaldata.MetricsData) { want := 0 for _, p := range td.pages { if p.code == 200 { @@ -248,7 +247,7 @@ rpc_duration_seconds_sum 5002 rpc_duration_seconds_count 1001 ` -func verifyTarget1(t *testing.T, td *testData, mds []consumerdata.MetricsData) { +func verifyTarget1(t *testing.T, td *testData, mds []internaldata.MetricsData) { verifyNumScrapeResults(t, td, mds) m1 := mds[0] // m1 shall only have a gauge @@ -282,7 +281,7 @@ func verifyTarget1(t *testing.T, td *testData, mds []consumerdata.MetricsData) { m2 := mds[1] ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp - want2 := &consumerdata.MetricsData{ + want2 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -475,7 +474,7 @@ http_requests_total{method="post",code="400"} 59 http_requests_total{method="post",code="500"} 5 ` -func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) { +func verifyTarget2(t *testing.T, td *testData, mds []internaldata.MetricsData) { verifyNumScrapeResults(t, td, mds) m1 := mds[0] // m1 shall only have a gauge @@ -508,7 +507,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) { m2 := mds[1] ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp - want2 := &consumerdata.MetricsData{ + want2 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -565,7 +564,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) { // its start timestamp shall be from the 2nd run ts3 := m3.Metrics[0].Timeseries[0].Points[0].Timestamp - want3 := &consumerdata.MetricsData{ + want3 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -631,7 +630,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) { m4 := mds[3] ts4 := m4.Metrics[0].Timeseries[0].Points[0].Timestamp - want4 := &consumerdata.MetricsData{ + want4 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -658,7 +657,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) { // its start timestamp shall be from the 3rd run ts5 := m5.Metrics[0].Timeseries[0].Points[0].Timestamp - want5 := &consumerdata.MetricsData{ + want5 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -793,7 +792,7 @@ rpc_duration_seconds_sum{foo="no_quantile"} 101 rpc_duration_seconds_count{foo="no_quantile"} 55 ` -func verifyTarget3(t *testing.T, td *testData, mds []consumerdata.MetricsData) { +func verifyTarget3(t *testing.T, td *testData, mds []internaldata.MetricsData) { verifyNumScrapeResults(t, td, mds) m1 := mds[0] // m1 shall only have a gauge @@ -825,7 +824,7 @@ func verifyTarget3(t *testing.T, td *testData, mds []consumerdata.MetricsData) { m2 := mds[1] ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp - want2 := &consumerdata.MetricsData{ + want2 := &internaldata.MetricsData{ Node: td.node, Resource: td.resource, Metrics: []*metricspb.Metric{ @@ -1025,7 +1024,7 @@ var startTimeMetricPageStartTimestamp = ×tamppb.Timestamp{Seconds: 400, Nan const numStartTimeMetricPageTimeseries = 6 -func verifyStartTimeMetricPage(t *testing.T, _ *testData, mds []consumerdata.MetricsData) { +func verifyStartTimeMetricPage(t *testing.T, _ *testData, mds []internaldata.MetricsData) { numTimeseries := 0 for _, cmd := range mds { for _, metric := range cmd.Metrics { @@ -1074,13 +1073,13 @@ func testEndToEnd(t *testing.T, targets []*testData, useStartTimeMetric bool) { metrics := cms.AllMetrics() // split and store results by target name - results := make(map[string][]consumerdata.MetricsData) + results := make(map[string][]internaldata.MetricsData) for _, m := range metrics { ocmds := internaldata.MetricsToOC(m) for _, ocmd := range ocmds { result, ok := results[ocmd.Node.ServiceInfo.Name] if !ok { - result = make([]consumerdata.MetricsData, 0) + result = make([]internaldata.MetricsData, 0) } results[ocmd.Node.ServiceInfo.Name] = append(result, ocmd) } @@ -1161,13 +1160,13 @@ func testEndToEndRegex(t *testing.T, targets []*testData, useStartTimeMetric boo metrics := cms.AllMetrics() // split and store results by target name - results := make(map[string][]consumerdata.MetricsData) + results := make(map[string][]internaldata.MetricsData) for _, m := range metrics { ocmds := internaldata.MetricsToOC(m) for _, ocmd := range ocmds { result, ok := results[ocmd.Node.ServiceInfo.Name] if !ok { - result = make([]consumerdata.MetricsData, 0) + result = make([]internaldata.MetricsData, 0) } results[ocmd.Node.ServiceInfo.Name] = append(result, ocmd) } diff --git a/consumer/consumerdata/consumerdata.go b/translator/internaldata/consumerdata.go similarity index 90% rename from consumer/consumerdata/consumerdata.go rename to translator/internaldata/consumerdata.go index 56f86b2c5ad..7ce0807a3d1 100644 --- a/consumer/consumerdata/consumerdata.go +++ b/translator/internaldata/consumerdata.go @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package consumerdata contains data structures that holds proto metrics/spans, node and resource. -package consumerdata +package internaldata import ( commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" diff --git a/translator/internaldata/metrics_to_oc.go b/translator/internaldata/metrics_to_oc.go index ccefa551da6..fca19c74278 100644 --- a/translator/internaldata/metrics_to_oc.go +++ b/translator/internaldata/metrics_to_oc.go @@ -20,7 +20,6 @@ import ( ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "github.com/golang/protobuf/ptypes/wrappers" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/pdata" ) @@ -34,14 +33,14 @@ type labelKeys struct { // MetricsToOC may be used only by OpenCensus receiver and exporter implementations. // TODO: move this function to OpenCensus package. -func MetricsToOC(md pdata.Metrics) []consumerdata.MetricsData { +func MetricsToOC(md pdata.Metrics) []MetricsData { resourceMetrics := md.ResourceMetrics() if resourceMetrics.Len() == 0 { return nil } - ocResourceMetricsList := make([]consumerdata.MetricsData, 0, resourceMetrics.Len()) + ocResourceMetricsList := make([]MetricsData, 0, resourceMetrics.Len()) for i := 0; i < resourceMetrics.Len(); i++ { ocResourceMetricsList = append(ocResourceMetricsList, resourceMetricsToOC(resourceMetrics.At(i))) } @@ -49,8 +48,8 @@ func MetricsToOC(md pdata.Metrics) []consumerdata.MetricsData { return ocResourceMetricsList } -func resourceMetricsToOC(rm pdata.ResourceMetrics) consumerdata.MetricsData { - ocMetricsData := consumerdata.MetricsData{} +func resourceMetricsToOC(rm pdata.ResourceMetrics) MetricsData { + ocMetricsData := MetricsData{} ocMetricsData.Node, ocMetricsData.Resource = internalResourceToOC(rm.Resource()) ilms := rm.InstrumentationLibraryMetrics() if ilms.Len() == 0 { diff --git a/translator/internaldata/metrics_to_oc_test.go b/translator/internaldata/metrics_to_oc_test.go index e6488e9666c..aa61b258c78 100644 --- a/translator/internaldata/metrics_to_oc_test.go +++ b/translator/internaldata/metrics_to_oc_test.go @@ -24,7 +24,6 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" "go.opentelemetry.io/collector/translator/conventions" @@ -43,18 +42,18 @@ func TestMetricsToOC(t *testing.T) { tests := []struct { name string internal pdata.Metrics - oc []consumerdata.MetricsData + oc []MetricsData }{ { name: "empty", internal: testdata.GenerateMetricsEmpty(), - oc: []consumerdata.MetricsData(nil), + oc: []MetricsData(nil), }, { name: "one-empty-resource-metrics", internal: testdata.GenerateMetricsOneEmptyResourceMetrics(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ {}, }, }, @@ -62,7 +61,7 @@ func TestMetricsToOC(t *testing.T) { { name: "no-libraries", internal: testdata.GenerateMetricsNoLibraries(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestDataNoMetrics(), }, }, @@ -70,7 +69,7 @@ func TestMetricsToOC(t *testing.T) { { name: "one-empty-instrumentation-library", internal: testdata.GenerateMetricsOneEmptyInstrumentationLibrary(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestDataNoMetrics(), }, }, @@ -78,7 +77,7 @@ func TestMetricsToOC(t *testing.T) { { name: "one-metric-no-resource", internal: testdata.GenerateMetricsOneMetricNoResource(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ { Metrics: []*ocmetrics.Metric{ generateOCTestMetricInt(), @@ -90,7 +89,7 @@ func TestMetricsToOC(t *testing.T) { { name: "one-metric", internal: testdata.GenerateMetricsOneMetric(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestDataMetricsOneMetric(), }, }, @@ -98,7 +97,7 @@ func TestMetricsToOC(t *testing.T) { { name: "one-metric-no-labels", internal: testdata.GenerateMetricsOneMetricNoLabels(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestDataNoLabels(), }, }, @@ -106,7 +105,7 @@ func TestMetricsToOC(t *testing.T) { { name: "all-types-no-data-points", internal: testdata.GenerateMetricsAllTypesNoDataPoints(), - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestDataNoPoints(), }, }, @@ -114,7 +113,7 @@ func TestMetricsToOC(t *testing.T) { { name: "sample-metric", internal: sampleMetricData, - oc: []consumerdata.MetricsData{ + oc: []MetricsData{ generateOCTestData(), }, }, @@ -130,7 +129,7 @@ func TestMetricsToOC(t *testing.T) { func TestMetricsToOC_InvalidDataType(t *testing.T) { internal := testdata.GenerateMetricsMetricTypeInvalid() - want := []consumerdata.MetricsData{ + want := []MetricsData{ { Node: &occommon.Node{}, Resource: &ocresource.Resource{ @@ -152,10 +151,10 @@ func TestMetricsToOC_InvalidDataType(t *testing.T) { assert.EqualValues(t, want, got) } -func generateOCTestData() consumerdata.MetricsData { +func generateOCTestData() MetricsData { ts := timestamppb.New(time.Date(2020, 2, 11, 20, 26, 0, 0, time.UTC)) - return consumerdata.MetricsData{ + return MetricsData{ Node: &occommon.Node{ Identifier: &occommon.ProcessIdentifier{ HostName: "host1", diff --git a/translator/internaldata/oc_testdata_test.go b/translator/internaldata/oc_testdata_test.go index 1fffff2471f..d9164ca9903 100644 --- a/translator/internaldata/oc_testdata_test.go +++ b/translator/internaldata/oc_testdata_test.go @@ -23,14 +23,13 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" "go.opentelemetry.io/collector/translator/conventions" ) -func generateOCTestDataNoMetrics() consumerdata.MetricsData { - return consumerdata.MetricsData{ +func generateOCTestDataNoMetrics() MetricsData { + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -38,8 +37,8 @@ func generateOCTestDataNoMetrics() consumerdata.MetricsData { } } -func generateOCTestDataNoPoints() consumerdata.MetricsData { - return consumerdata.MetricsData{ +func generateOCTestDataNoPoints() MetricsData { + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -105,12 +104,12 @@ func generateOCTestDataNoPoints() consumerdata.MetricsData { } } -func generateOCTestDataNoLabels() consumerdata.MetricsData { +func generateOCTestDataNoLabels() MetricsData { m := generateOCTestMetricInt() m.MetricDescriptor.LabelKeys = nil m.Timeseries[0].LabelValues = nil m.Timeseries[1].LabelValues = nil - return consumerdata.MetricsData{ + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -119,8 +118,8 @@ func generateOCTestDataNoLabels() consumerdata.MetricsData { } } -func generateOCTestDataMetricsOneMetric() consumerdata.MetricsData { - return consumerdata.MetricsData{ +func generateOCTestDataMetricsOneMetric() MetricsData { + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -129,8 +128,8 @@ func generateOCTestDataMetricsOneMetric() consumerdata.MetricsData { } } -func generateOCTestDataMetricsOneMetricOneNil() consumerdata.MetricsData { - return consumerdata.MetricsData{ +func generateOCTestDataMetricsOneMetricOneNil() MetricsData { + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -139,10 +138,10 @@ func generateOCTestDataMetricsOneMetricOneNil() consumerdata.MetricsData { } } -func generateOCTestDataMetricsOneMetricOneNilTimeseries() consumerdata.MetricsData { +func generateOCTestDataMetricsOneMetricOneNilTimeseries() MetricsData { m := generateOCTestMetricInt() m.Timeseries = append(m.Timeseries, nil) - return consumerdata.MetricsData{ + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, @@ -151,10 +150,10 @@ func generateOCTestDataMetricsOneMetricOneNilTimeseries() consumerdata.MetricsDa } } -func generateOCTestDataMetricsOneMetricOneNilPoint() consumerdata.MetricsData { +func generateOCTestDataMetricsOneMetricOneNilPoint() MetricsData { m := generateOCTestMetricInt() m.Timeseries[0].Points = append(m.Timeseries[0].Points, nil) - return consumerdata.MetricsData{ + return MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{ Labels: map[string]string{"resource-attr": "resource-attr-val-1"}, diff --git a/translator/internaldata/oc_to_metrics.go b/translator/internaldata/oc_to_metrics.go index 3be4771f401..b31391a758e 100644 --- a/translator/internaldata/oc_to_metrics.go +++ b/translator/internaldata/oc_to_metrics.go @@ -18,13 +18,12 @@ import ( occommon "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/pdata" ) // OCSliceToMetricData converts a slice of OC data format to data.MetricData. // Deprecated: use pdata.Metrics instead. -func OCSliceToMetrics(ocmds []consumerdata.MetricsData) pdata.Metrics { +func OCSliceToMetrics(ocmds []MetricsData) pdata.Metrics { metricData := pdata.NewMetrics() if len(ocmds) == 0 { return metricData @@ -38,13 +37,13 @@ func OCSliceToMetrics(ocmds []consumerdata.MetricsData) pdata.Metrics { // OCToMetricData converts OC data format to data.MetricData. // Deprecated: use pdata.Metrics instead. OCToMetrics may be used only by OpenCensus // receiver and exporter implementations. -func OCToMetrics(md consumerdata.MetricsData) pdata.Metrics { +func OCToMetrics(md MetricsData) pdata.Metrics { metricData := pdata.NewMetrics() appendOcToMetrics(md, metricData) return metricData } -func appendOcToMetrics(md consumerdata.MetricsData, dest pdata.Metrics) { +func appendOcToMetrics(md MetricsData, dest pdata.Metrics) { if md.Node == nil && md.Resource == nil && len(md.Metrics) == 0 { return } diff --git a/translator/internaldata/oc_to_metrics_test.go b/translator/internaldata/oc_to_metrics_test.go index b4d989659ba..6ea25812e00 100644 --- a/translator/internaldata/oc_to_metrics_test.go +++ b/translator/internaldata/oc_to_metrics_test.go @@ -22,7 +22,6 @@ import ( ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/consumerdata" "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" ) @@ -43,18 +42,18 @@ func TestOCToMetrics(t *testing.T) { tests := []struct { name string - oc consumerdata.MetricsData + oc MetricsData internal pdata.Metrics }{ { name: "empty", - oc: consumerdata.MetricsData{}, + oc: MetricsData{}, internal: testdata.GenerateMetricsEmpty(), }, { name: "one-empty-resource-metrics", - oc: consumerdata.MetricsData{ + oc: MetricsData{ Node: &occommon.Node{}, Resource: &ocresource.Resource{}, }, @@ -87,7 +86,7 @@ func TestOCToMetrics(t *testing.T) { { name: "one-metric-one-summary", - oc: consumerdata.MetricsData{ + oc: MetricsData{ Resource: generateOCTestResource(), Metrics: []*ocmetrics.Metric{ generateOCTestMetricInt(), @@ -123,7 +122,7 @@ func TestOCToMetrics(t *testing.T) { { name: "sample-metric", - oc: consumerdata.MetricsData{ + oc: MetricsData{ Resource: generateOCTestResource(), Metrics: []*ocmetrics.Metric{ generateOCTestMetricInt(), @@ -142,7 +141,7 @@ func TestOCToMetrics(t *testing.T) { got := OCToMetrics(test.oc) assert.EqualValues(t, test.internal, got) - ocslice := []consumerdata.MetricsData{ + ocslice := []MetricsData{ test.oc, test.oc, } @@ -187,7 +186,7 @@ func TestOCToMetrics_ResourceInMetricOnly(t *testing.T) { } func BenchmarkMetricIntOCToMetrics(b *testing.B) { - ocMetric := consumerdata.MetricsData{ + ocMetric := MetricsData{ Resource: generateOCTestResource(), Metrics: []*ocmetrics.Metric{ generateOCTestMetricInt(), @@ -203,7 +202,7 @@ func BenchmarkMetricIntOCToMetrics(b *testing.B) { } func BenchmarkMetricDoubleOCToMetrics(b *testing.B) { - ocMetric := consumerdata.MetricsData{ + ocMetric := MetricsData{ Resource: generateOCTestResource(), Metrics: []*ocmetrics.Metric{ generateOCTestMetricDouble(), @@ -219,7 +218,7 @@ func BenchmarkMetricDoubleOCToMetrics(b *testing.B) { } func BenchmarkMetricHistogramOCToMetrics(b *testing.B) { - ocMetric := consumerdata.MetricsData{ + ocMetric := MetricsData{ Resource: generateOCTestResource(), Metrics: []*ocmetrics.Metric{ generateOCTestMetricDoubleHistogram(),