Skip to content

Commit c93ba80

Browse files
bogdandrutubogdandrutu
committed
Remove TraceData, move MetricsData to internaldata
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 parent 7d7ae2e commit c93ba80

File tree

12 files changed

+72
-88
lines changed

12 files changed

+72
-88
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Unreleased
44

5+
## 🛑 Breaking changes 🛑
6+
7+
- Remove `consumerdata.TraceData` (#2512)
8+
- Move `consumerdata.MetricsData` to `internaldata.MetricsData` (#2512)
9+
510
## v0.21.0 Beta
611

712
## 🛑 Breaking changes 🛑

‎exporter/prometheusexporter/prometheus_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"google.golang.org/protobuf/types/known/timestamppb"
3030

3131
"go.opentelemetry.io/collector/component"
32-
"go.opentelemetry.io/collector/consumer/consumerdata"
3332
"go.opentelemetry.io/collector/translator/internaldata"
3433
)
3534

@@ -101,7 +100,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) {
101100
assert.NotNil(t, exp)
102101

103102
for delta := 0; delta <= 20; delta += 10 {
104-
md := internaldata.OCToMetrics(consumerdata.MetricsData{Metrics: metricBuilder(int64(delta))})
103+
md := internaldata.OCToMetrics(internaldata.MetricsData{Metrics: metricBuilder(int64(delta))})
105104
assert.NoError(t, exp.ConsumeMetrics(context.Background(), md))
106105

107106
res, err := http.Get("http://localhost:7777/metrics")
@@ -152,7 +151,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) {
152151
assert.NotNil(t, exp)
153152

154153
for delta := 0; delta <= 20; delta += 10 {
155-
md := internaldata.OCToMetrics(consumerdata.MetricsData{Metrics: metricBuilder(int64(delta))})
154+
md := internaldata.OCToMetrics(internaldata.MetricsData{Metrics: metricBuilder(int64(delta))})
156155
assert.NoError(t, exp.ConsumeMetrics(context.Background(), md))
157156

158157
res, err := http.Get("http://localhost:7777/metrics")

‎processor/filterprocessor/filter_processor_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929

3030
"go.opentelemetry.io/collector/component"
3131
"go.opentelemetry.io/collector/config/configmodels"
32-
"go.opentelemetry.io/collector/consumer/consumerdata"
3332
"go.opentelemetry.io/collector/consumer/consumertest"
3433
"go.opentelemetry.io/collector/consumer/pdata"
3534
"go.opentelemetry.io/collector/internal/goldendataset"
@@ -333,9 +332,9 @@ func TestFilterMetricProcessor(t *testing.T) {
333332
ctx := context.Background()
334333
assert.NoError(t, fmp.Start(ctx, nil))
335334

336-
mds := make([]consumerdata.MetricsData, len(test.inMN))
335+
mds := make([]internaldata.MetricsData, len(test.inMN))
337336
for i, metrics := range test.inMN {
338-
mds[i] = consumerdata.MetricsData{
337+
mds[i] = internaldata.MetricsData{
339338
Metrics: metrics,
340339
}
341340
}

‎receiver/opencensusreceiver/ocmetrics/opencensus.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"go.opentelemetry.io/collector/component/componenterror"
2727
"go.opentelemetry.io/collector/consumer"
28-
"go.opentelemetry.io/collector/consumer/consumerdata"
2928
"go.opentelemetry.io/collector/obsreport"
3029
"go.opentelemetry.io/collector/translator/internaldata"
3130
)
@@ -117,7 +116,7 @@ func (ocr *Receiver) processReceivedMsg(
117116
resource = recv.Resource
118117
}
119118

120-
md := consumerdata.MetricsData{
119+
md := internaldata.MetricsData{
121120
Node: lastNonNilNode,
122121
Resource: resource,
123122
Metrics: recv.Metrics,
@@ -127,7 +126,7 @@ func (ocr *Receiver) processReceivedMsg(
127126
return lastNonNilNode, resource, err
128127
}
129128

130-
func (ocr *Receiver) sendToNextConsumer(longLivedRPCCtx context.Context, md consumerdata.MetricsData) error {
129+
func (ocr *Receiver) sendToNextConsumer(longLivedRPCCtx context.Context, md internaldata.MetricsData) error {
131130
ctx := obsreport.StartMetricsReceiveOp(
132131
longLivedRPCCtx,
133132
ocr.instanceName,

‎receiver/prometheusreceiver/internal/transaction.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import (
3131
"google.golang.org/protobuf/types/known/timestamppb"
3232

3333
"go.opentelemetry.io/collector/consumer"
34-
"go.opentelemetry.io/collector/consumer/consumerdata"
3534
"go.opentelemetry.io/collector/obsreport"
3635
"go.opentelemetry.io/collector/translator/internaldata"
3736
)
@@ -176,7 +175,7 @@ func (tr *transaction) Commit() error {
176175

177176
numPoints := 0
178177
if len(metrics) > 0 {
179-
md := internaldata.OCToMetrics(consumerdata.MetricsData{
178+
md := internaldata.OCToMetrics(internaldata.MetricsData{
180179
Node: tr.node,
181180
Resource: tr.resource,
182181
Metrics: metrics,

‎receiver/prometheusreceiver/metrics_receiver_test.go‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"gopkg.in/yaml.v2"
4040

4141
"go.opentelemetry.io/collector/component/componenttest"
42-
"go.opentelemetry.io/collector/consumer/consumerdata"
4342
"go.opentelemetry.io/collector/consumer/consumertest"
4443
"go.opentelemetry.io/collector/translator/internaldata"
4544
)
@@ -111,7 +110,7 @@ type testData struct {
111110
pages []mockPrometheusResponse
112111
node *commonpb.Node
113112
resource *resourcepb.Resource
114-
validateFunc func(t *testing.T, td *testData, result []consumerdata.MetricsData)
113+
validateFunc func(t *testing.T, td *testData, result []internaldata.MetricsData)
115114
}
116115

117116
// 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
167166
return mp, pCfg, err
168167
}
169168

170-
func verifyNumScrapeResults(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
169+
func verifyNumScrapeResults(t *testing.T, td *testData, mds []internaldata.MetricsData) {
171170
want := 0
172171
for _, p := range td.pages {
173172
if p.code == 200 {
@@ -248,7 +247,7 @@ rpc_duration_seconds_sum 5002
248247
rpc_duration_seconds_count 1001
249248
`
250249

251-
func verifyTarget1(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
250+
func verifyTarget1(t *testing.T, td *testData, mds []internaldata.MetricsData) {
252251
verifyNumScrapeResults(t, td, mds)
253252
m1 := mds[0]
254253
// m1 shall only have a gauge
@@ -282,7 +281,7 @@ func verifyTarget1(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
282281
m2 := mds[1]
283282
ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp
284283

285-
want2 := &consumerdata.MetricsData{
284+
want2 := &internaldata.MetricsData{
286285
Node: td.node,
287286
Resource: td.resource,
288287
Metrics: []*metricspb.Metric{
@@ -475,7 +474,7 @@ http_requests_total{method="post",code="400"} 59
475474
http_requests_total{method="post",code="500"} 5
476475
`
477476

478-
func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
477+
func verifyTarget2(t *testing.T, td *testData, mds []internaldata.MetricsData) {
479478
verifyNumScrapeResults(t, td, mds)
480479
m1 := mds[0]
481480
// m1 shall only have a gauge
@@ -508,7 +507,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
508507
m2 := mds[1]
509508
ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp
510509

511-
want2 := &consumerdata.MetricsData{
510+
want2 := &internaldata.MetricsData{
512511
Node: td.node,
513512
Resource: td.resource,
514513
Metrics: []*metricspb.Metric{
@@ -565,7 +564,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
565564
// its start timestamp shall be from the 2nd run
566565
ts3 := m3.Metrics[0].Timeseries[0].Points[0].Timestamp
567566

568-
want3 := &consumerdata.MetricsData{
567+
want3 := &internaldata.MetricsData{
569568
Node: td.node,
570569
Resource: td.resource,
571570
Metrics: []*metricspb.Metric{
@@ -631,7 +630,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
631630
m4 := mds[3]
632631
ts4 := m4.Metrics[0].Timeseries[0].Points[0].Timestamp
633632

634-
want4 := &consumerdata.MetricsData{
633+
want4 := &internaldata.MetricsData{
635634
Node: td.node,
636635
Resource: td.resource,
637636
Metrics: []*metricspb.Metric{
@@ -658,7 +657,7 @@ func verifyTarget2(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
658657
// its start timestamp shall be from the 3rd run
659658
ts5 := m5.Metrics[0].Timeseries[0].Points[0].Timestamp
660659

661-
want5 := &consumerdata.MetricsData{
660+
want5 := &internaldata.MetricsData{
662661
Node: td.node,
663662
Resource: td.resource,
664663
Metrics: []*metricspb.Metric{
@@ -793,7 +792,7 @@ rpc_duration_seconds_sum{foo="no_quantile"} 101
793792
rpc_duration_seconds_count{foo="no_quantile"} 55
794793
`
795794

796-
func verifyTarget3(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
795+
func verifyTarget3(t *testing.T, td *testData, mds []internaldata.MetricsData) {
797796
verifyNumScrapeResults(t, td, mds)
798797
m1 := mds[0]
799798
// m1 shall only have a gauge
@@ -825,7 +824,7 @@ func verifyTarget3(t *testing.T, td *testData, mds []consumerdata.MetricsData) {
825824
m2 := mds[1]
826825
ts2 := m2.Metrics[0].Timeseries[0].Points[0].Timestamp
827826

828-
want2 := &consumerdata.MetricsData{
827+
want2 := &internaldata.MetricsData{
829828
Node: td.node,
830829
Resource: td.resource,
831830
Metrics: []*metricspb.Metric{
@@ -1025,7 +1024,7 @@ var startTimeMetricPageStartTimestamp = &timestamppb.Timestamp{Seconds: 400, Nan
10251024

10261025
const numStartTimeMetricPageTimeseries = 6
10271026

1028-
func verifyStartTimeMetricPage(t *testing.T, _ *testData, mds []consumerdata.MetricsData) {
1027+
func verifyStartTimeMetricPage(t *testing.T, _ *testData, mds []internaldata.MetricsData) {
10291028
numTimeseries := 0
10301029
for _, cmd := range mds {
10311030
for _, metric := range cmd.Metrics {
@@ -1074,13 +1073,13 @@ func testEndToEnd(t *testing.T, targets []*testData, useStartTimeMetric bool) {
10741073
metrics := cms.AllMetrics()
10751074

10761075
// split and store results by target name
1077-
results := make(map[string][]consumerdata.MetricsData)
1076+
results := make(map[string][]internaldata.MetricsData)
10781077
for _, m := range metrics {
10791078
ocmds := internaldata.MetricsToOC(m)
10801079
for _, ocmd := range ocmds {
10811080
result, ok := results[ocmd.Node.ServiceInfo.Name]
10821081
if !ok {
1083-
result = make([]consumerdata.MetricsData, 0)
1082+
result = make([]internaldata.MetricsData, 0)
10841083
}
10851084
results[ocmd.Node.ServiceInfo.Name] = append(result, ocmd)
10861085
}
@@ -1161,13 +1160,13 @@ func testEndToEndRegex(t *testing.T, targets []*testData, useStartTimeMetric boo
11611160
metrics := cms.AllMetrics()
11621161

11631162
// split and store results by target name
1164-
results := make(map[string][]consumerdata.MetricsData)
1163+
results := make(map[string][]internaldata.MetricsData)
11651164
for _, m := range metrics {
11661165
ocmds := internaldata.MetricsToOC(m)
11671166
for _, ocmd := range ocmds {
11681167
result, ok := results[ocmd.Node.ServiceInfo.Name]
11691168
if !ok {
1170-
result = make([]consumerdata.MetricsData, 0)
1169+
result = make([]internaldata.MetricsData, 0)
11711170
}
11721171
results[ocmd.Node.ServiceInfo.Name] = append(result, ocmd)
11731172
}

consumer/consumerdata/consumerdata.go renamed to translator/internaldata/consumerdata.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Package consumerdata contains data structures that holds proto metrics/spans, node and resource.
16-
package consumerdata
15+
package internaldata
1716

1817
import (
1918
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
2019
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
2120
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
22-
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
2321
)
2422

2523
// MetricsData is a struct that groups proto metrics with a unique node and a resource.
@@ -29,12 +27,3 @@ type MetricsData struct {
2927
Resource *resourcepb.Resource
3028
Metrics []*metricspb.Metric
3129
}
32-
33-
// TraceData is a struct that groups proto spans with a unique node and a resource.
34-
// Deprecated: use pdata.Traces instead.
35-
type TraceData struct {
36-
Node *commonpb.Node
37-
Resource *resourcepb.Resource
38-
Spans []*tracepb.Span
39-
SourceFormat string
40-
}

‎translator/internaldata/metrics_to_oc.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
2121
"github.com/golang/protobuf/ptypes/wrappers"
2222

23-
"go.opentelemetry.io/collector/consumer/consumerdata"
2423
"go.opentelemetry.io/collector/consumer/pdata"
2524
)
2625

@@ -34,23 +33,23 @@ type labelKeys struct {
3433

3534
// MetricsToOC may be used only by OpenCensus receiver and exporter implementations.
3635
// TODO: move this function to OpenCensus package.
37-
func MetricsToOC(md pdata.Metrics) []consumerdata.MetricsData {
36+
func MetricsToOC(md pdata.Metrics) []MetricsData {
3837
resourceMetrics := md.ResourceMetrics()
3938

4039
if resourceMetrics.Len() == 0 {
4140
return nil
4241
}
4342

44-
ocResourceMetricsList := make([]consumerdata.MetricsData, 0, resourceMetrics.Len())
43+
ocResourceMetricsList := make([]MetricsData, 0, resourceMetrics.Len())
4544
for i := 0; i < resourceMetrics.Len(); i++ {
4645
ocResourceMetricsList = append(ocResourceMetricsList, resourceMetricsToOC(resourceMetrics.At(i)))
4746
}
4847

4948
return ocResourceMetricsList
5049
}
5150

52-
func resourceMetricsToOC(rm pdata.ResourceMetrics) consumerdata.MetricsData {
53-
ocMetricsData := consumerdata.MetricsData{}
51+
func resourceMetricsToOC(rm pdata.ResourceMetrics) MetricsData {
52+
ocMetricsData := MetricsData{}
5453
ocMetricsData.Node, ocMetricsData.Resource = internalResourceToOC(rm.Resource())
5554
ilms := rm.InstrumentationLibraryMetrics()
5655
if ilms.Len() == 0 {

0 commit comments

Comments
 (0)