From 7b1a5308dbd9fa919f2dc23862c9ee3f2a220166 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 28 Jun 2021 15:00:47 -0700 Subject: [PATCH] Move internal/otlp to model/otlp Signed-off-by: Bogdan Drutu --- exporter/fileexporter/file_exporter.go | 8 +++--- exporter/fileexporter/file_exporter_test.go | 8 +++--- exporter/kafkaexporter/kafka_exporter_test.go | 14 +++++----- exporter/kafkaexporter/marshaler.go | 8 +++--- exporter/otlphttpexporter/otlp.go | 8 +++--- {internal => model}/otlp/json_marshaler.go | 0 {internal => model}/otlp/json_test.go | 0 {internal => model}/otlp/json_unmarshaler.go | 0 {internal => model}/otlp/pb_marshaler.go | 0 {internal => model}/otlp/pb_test.go | 0 {internal => model}/otlp/pb_unmarshaler.go | 0 receiver/kafkareceiver/kafka_receiver_test.go | 26 +++++++++---------- .../kafkareceiver/pdata_unmarshaler_test.go | 8 +++--- receiver/kafkareceiver/unmarshaler.go | 8 +++--- receiver/otlpreceiver/otlp.go | 14 +++++----- receiver/otlpreceiver/otlp_test.go | 6 ++--- testbed/testbed/data_providers.go | 8 +++--- 17 files changed, 58 insertions(+), 58 deletions(-) rename {internal => model}/otlp/json_marshaler.go (100%) rename {internal => model}/otlp/json_test.go (100%) rename {internal => model}/otlp/json_unmarshaler.go (100%) rename {internal => model}/otlp/pb_marshaler.go (100%) rename {internal => model}/otlp/pb_test.go (100%) rename {internal => model}/otlp/pb_unmarshaler.go (100%) diff --git a/exporter/fileexporter/file_exporter.go b/exporter/fileexporter/file_exporter.go index 65f13184bae..2595cfc954a 100644 --- a/exporter/fileexporter/file_exporter.go +++ b/exporter/fileexporter/file_exporter.go @@ -22,14 +22,14 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" ) // Marshaler configuration used for marhsaling Protobuf to JSON. -var tracesMarshaler = otlp.NewJSONTracesMarshaler() -var metricsMarshaler = otlp.NewJSONMetricsMarshaler() -var logsMarshaler = otlp.NewJSONLogsMarshaler() +var tracesMarshaler = otlp2.NewJSONTracesMarshaler() +var metricsMarshaler = otlp2.NewJSONMetricsMarshaler() +var logsMarshaler = otlp2.NewJSONLogsMarshaler() // fileExporter is the implementation of file exporter that writes telemetry data to a file // in Protobuf-JSON format. diff --git a/exporter/fileexporter/file_exporter_test.go b/exporter/fileexporter/file_exporter_test.go index a247ad43105..e53f8b81b9e 100644 --- a/exporter/fileexporter/file_exporter_test.go +++ b/exporter/fileexporter/file_exporter_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + otlp2 "go.opentelemetry.io/collector/model/otlp" ) func TestFileTracesExporter(t *testing.T) { @@ -37,7 +37,7 @@ func TestFileTracesExporter(t *testing.T) { assert.NoError(t, fe.ConsumeTraces(context.Background(), td)) assert.NoError(t, fe.Shutdown(context.Background())) - unmarshaler := otlp.NewJSONTracesUnmarshaler() + unmarshaler := otlp2.NewJSONTracesUnmarshaler() buf, err := ioutil.ReadFile(fe.path) assert.NoError(t, err) got, err := unmarshaler.UnmarshalTraces(buf) @@ -65,7 +65,7 @@ func TestFileMetricsExporter(t *testing.T) { assert.NoError(t, fe.ConsumeMetrics(context.Background(), md)) assert.NoError(t, fe.Shutdown(context.Background())) - unmarshaler := otlp.NewJSONMetricsUnmarshaler() + unmarshaler := otlp2.NewJSONMetricsUnmarshaler() buf, err := ioutil.ReadFile(fe.path) assert.NoError(t, err) got, err := unmarshaler.UnmarshalMetrics(buf) @@ -93,7 +93,7 @@ func TestFileLogsExporter(t *testing.T) { assert.NoError(t, fe.ConsumeLogs(context.Background(), ld)) assert.NoError(t, fe.Shutdown(context.Background())) - unmarshaler := otlp.NewJSONLogsUnmarshaler() + unmarshaler := otlp2.NewJSONLogsUnmarshaler() buf, err := ioutil.ReadFile(fe.path) assert.NoError(t, err) got, err := unmarshaler.UnmarshalLogs(buf) diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index baf2002bbbe..7915728b553 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" ) @@ -125,7 +125,7 @@ func TestTracesPusher(t *testing.T) { p := kafkaTracesProducer{ producer: producer, - marshaler: newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding), + marshaler: newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding), } t.Cleanup(func() { require.NoError(t, p.Close(context.Background())) @@ -142,7 +142,7 @@ func TestTracesPusher_err(t *testing.T) { p := kafkaTracesProducer{ producer: producer, - marshaler: newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding), + marshaler: newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding), logger: zap.NewNop(), } t.Cleanup(func() { @@ -172,7 +172,7 @@ func TestMetricsDataPusher(t *testing.T) { p := kafkaMetricsProducer{ producer: producer, - marshaler: newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding), + marshaler: newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding), } t.Cleanup(func() { require.NoError(t, p.Close(context.Background())) @@ -189,7 +189,7 @@ func TestMetricsDataPusher_err(t *testing.T) { p := kafkaMetricsProducer{ producer: producer, - marshaler: newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding), + marshaler: newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding), logger: zap.NewNop(), } t.Cleanup(func() { @@ -219,7 +219,7 @@ func TestLogsDataPusher(t *testing.T) { p := kafkaLogsProducer{ producer: producer, - marshaler: newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding), + marshaler: newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding), } t.Cleanup(func() { require.NoError(t, p.Close(context.Background())) @@ -236,7 +236,7 @@ func TestLogsDataPusher_err(t *testing.T) { p := kafkaLogsProducer{ producer: producer, - marshaler: newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding), + marshaler: newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding), logger: zap.NewNop(), } t.Cleanup(func() { diff --git a/exporter/kafkaexporter/marshaler.go b/exporter/kafkaexporter/marshaler.go index 1906bbe6d65..60c5d13ed67 100644 --- a/exporter/kafkaexporter/marshaler.go +++ b/exporter/kafkaexporter/marshaler.go @@ -17,7 +17,7 @@ package kafkaexporter import ( "github.com/Shopify/sarama" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" ) @@ -50,7 +50,7 @@ type LogsMarshaler interface { // tracesMarshalers returns map of supported encodings with TracesMarshaler. func tracesMarshalers() map[string]TracesMarshaler { - otlpPb := newPdataTracesMarshaler(otlp.NewProtobufTracesMarshaler(), defaultEncoding) + otlpPb := newPdataTracesMarshaler(otlp2.NewProtobufTracesMarshaler(), defaultEncoding) jaegerProto := jaegerMarshaler{marshaler: jaegerProtoSpanMarshaler{}} jaegerJSON := jaegerMarshaler{marshaler: newJaegerJSONMarshaler()} return map[string]TracesMarshaler{ @@ -62,7 +62,7 @@ func tracesMarshalers() map[string]TracesMarshaler { // metricsMarshalers returns map of supported encodings and MetricsMarshaler func metricsMarshalers() map[string]MetricsMarshaler { - otlpPb := newPdataMetricsMarshaler(otlp.NewProtobufMetricsMarshaler(), defaultEncoding) + otlpPb := newPdataMetricsMarshaler(otlp2.NewProtobufMetricsMarshaler(), defaultEncoding) return map[string]MetricsMarshaler{ otlpPb.Encoding(): otlpPb, } @@ -70,7 +70,7 @@ func metricsMarshalers() map[string]MetricsMarshaler { // logsMarshalers returns map of supported encodings and LogsMarshaler func logsMarshalers() map[string]LogsMarshaler { - otlpPb := newPdataLogsMarshaler(otlp.NewProtobufLogsMarshaler(), defaultEncoding) + otlpPb := newPdataLogsMarshaler(otlp2.NewProtobufLogsMarshaler(), defaultEncoding) return map[string]LogsMarshaler{ otlpPb.Encoding(): otlpPb, } diff --git a/exporter/otlphttpexporter/otlp.go b/exporter/otlphttpexporter/otlp.go index 9175f937fcc..994bd1770e1 100644 --- a/exporter/otlphttpexporter/otlp.go +++ b/exporter/otlphttpexporter/otlp.go @@ -37,7 +37,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/middleware" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" ) @@ -52,9 +52,9 @@ type exporter struct { } var ( - tracesMarshaler = otlp.NewProtobufTracesMarshaler() - metricsMarshaler = otlp.NewProtobufMetricsMarshaler() - logsMarshaler = otlp.NewProtobufLogsMarshaler() + tracesMarshaler = otlp2.NewProtobufTracesMarshaler() + metricsMarshaler = otlp2.NewProtobufMetricsMarshaler() + logsMarshaler = otlp2.NewProtobufLogsMarshaler() ) const ( diff --git a/internal/otlp/json_marshaler.go b/model/otlp/json_marshaler.go similarity index 100% rename from internal/otlp/json_marshaler.go rename to model/otlp/json_marshaler.go diff --git a/internal/otlp/json_test.go b/model/otlp/json_test.go similarity index 100% rename from internal/otlp/json_test.go rename to model/otlp/json_test.go diff --git a/internal/otlp/json_unmarshaler.go b/model/otlp/json_unmarshaler.go similarity index 100% rename from internal/otlp/json_unmarshaler.go rename to model/otlp/json_unmarshaler.go diff --git a/internal/otlp/pb_marshaler.go b/model/otlp/pb_marshaler.go similarity index 100% rename from internal/otlp/pb_marshaler.go rename to model/otlp/pb_marshaler.go diff --git a/internal/otlp/pb_test.go b/model/otlp/pb_test.go similarity index 100% rename from internal/otlp/pb_test.go rename to model/otlp/pb_test.go diff --git a/internal/otlp/pb_unmarshaler.go b/model/otlp/pb_unmarshaler.go similarity index 100% rename from internal/otlp/pb_unmarshaler.go rename to model/otlp/pb_unmarshaler.go diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index ec316782767..31c5f97b8e5 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -33,8 +33,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/kafkaexporter" - "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) @@ -130,7 +130,7 @@ func TestTracesConsumerGroupHandler(t *testing.T) { defer view.Unregister(views...) c := tracesConsumerGroupHandler{ - unmarshaler: newPdataTracesUnmarshaler(otlp.NewProtobufTracesUnmarshaler(), defaultEncoding), + unmarshaler: newPdataTracesUnmarshaler(otlp2.NewProtobufTracesUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -172,7 +172,7 @@ func TestTracesConsumerGroupHandler(t *testing.T) { func TestTracesConsumerGroupHandler_error_unmarshal(t *testing.T) { c := tracesConsumerGroupHandler{ - unmarshaler: newPdataTracesUnmarshaler(otlp.NewProtobufTracesUnmarshaler(), defaultEncoding), + unmarshaler: newPdataTracesUnmarshaler(otlp2.NewProtobufTracesUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -197,7 +197,7 @@ func TestTracesConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestTracesConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") c := tracesConsumerGroupHandler{ - unmarshaler: newPdataTracesUnmarshaler(otlp.NewProtobufTracesUnmarshaler(), defaultEncoding), + unmarshaler: newPdataTracesUnmarshaler(otlp2.NewProtobufTracesUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewErr(consumerError), @@ -217,7 +217,7 @@ func TestTracesConsumerGroupHandler_error_nextConsumer(t *testing.T) { td := pdata.NewTraces() td.ResourceSpans().AppendEmpty() - bts, err := otlp.NewProtobufTracesMarshaler().MarshalTraces(td) + bts, err := otlp2.NewProtobufTracesMarshaler().MarshalTraces(td) require.NoError(t, err) groupClaim.messageChan <- &sarama.ConsumerMessage{Value: bts} close(groupClaim.messageChan) @@ -315,7 +315,7 @@ func TestMetricsConsumerGroupHandler(t *testing.T) { defer view.Unregister(views...) c := metricsConsumerGroupHandler{ - unmarshaler: newPdataMetricsUnmarshaler(otlp.NewProtobufMetricsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataMetricsUnmarshaler(otlp2.NewProtobufMetricsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -357,7 +357,7 @@ func TestMetricsConsumerGroupHandler(t *testing.T) { func TestMetricsConsumerGroupHandler_error_unmarshal(t *testing.T) { c := metricsConsumerGroupHandler{ - unmarshaler: newPdataMetricsUnmarshaler(otlp.NewProtobufMetricsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataMetricsUnmarshaler(otlp2.NewProtobufMetricsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -382,7 +382,7 @@ func TestMetricsConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestMetricsConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") c := metricsConsumerGroupHandler{ - unmarshaler: newPdataMetricsUnmarshaler(otlp.NewProtobufMetricsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataMetricsUnmarshaler(otlp2.NewProtobufMetricsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewErr(consumerError), @@ -401,7 +401,7 @@ func TestMetricsConsumerGroupHandler_error_nextConsumer(t *testing.T) { }() ld := testdata.GenerateMetricsOneMetric() - bts, err := otlp.NewProtobufMetricsMarshaler().MarshalMetrics(ld) + bts, err := otlp2.NewProtobufMetricsMarshaler().MarshalMetrics(ld) require.NoError(t, err) groupClaim.messageChan <- &sarama.ConsumerMessage{Value: bts} close(groupClaim.messageChan) @@ -499,7 +499,7 @@ func TestLogsConsumerGroupHandler(t *testing.T) { defer view.Unregister(views...) c := logsConsumerGroupHandler{ - unmarshaler: newPdataLogsUnmarshaler(otlp.NewProtobufLogsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataLogsUnmarshaler(otlp2.NewProtobufLogsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -541,7 +541,7 @@ func TestLogsConsumerGroupHandler(t *testing.T) { func TestLogsConsumerGroupHandler_error_unmarshal(t *testing.T) { c := logsConsumerGroupHandler{ - unmarshaler: newPdataLogsUnmarshaler(otlp.NewProtobufLogsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataLogsUnmarshaler(otlp2.NewProtobufLogsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewNop(), @@ -566,7 +566,7 @@ func TestLogsConsumerGroupHandler_error_unmarshal(t *testing.T) { func TestLogsConsumerGroupHandler_error_nextConsumer(t *testing.T) { consumerError := errors.New("failed to consume") c := logsConsumerGroupHandler{ - unmarshaler: newPdataLogsUnmarshaler(otlp.NewProtobufLogsUnmarshaler(), defaultEncoding), + unmarshaler: newPdataLogsUnmarshaler(otlp2.NewProtobufLogsUnmarshaler(), defaultEncoding), logger: zap.NewNop(), ready: make(chan bool), nextConsumer: consumertest.NewErr(consumerError), @@ -585,7 +585,7 @@ func TestLogsConsumerGroupHandler_error_nextConsumer(t *testing.T) { }() ld := testdata.GenerateLogsOneLogRecord() - bts, err := otlp.NewProtobufLogsMarshaler().MarshalLogs(ld) + bts, err := otlp2.NewProtobufLogsMarshaler().MarshalLogs(ld) require.NoError(t, err) groupClaim.messageChan <- &sarama.ConsumerMessage{Value: bts} close(groupClaim.messageChan) diff --git a/receiver/kafkareceiver/pdata_unmarshaler_test.go b/receiver/kafkareceiver/pdata_unmarshaler_test.go index 3d5ebde8976..84ab371ed65 100644 --- a/receiver/kafkareceiver/pdata_unmarshaler_test.go +++ b/receiver/kafkareceiver/pdata_unmarshaler_test.go @@ -19,20 +19,20 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" ) func TestNewPdataTracesUnmarshaler(t *testing.T) { - um := newPdataTracesUnmarshaler(otlp.NewProtobufTracesUnmarshaler(), "test") + um := newPdataTracesUnmarshaler(otlp2.NewProtobufTracesUnmarshaler(), "test") assert.Equal(t, "test", um.Encoding()) } func TestNewPdataMetricsUnmarshaler(t *testing.T) { - um := newPdataMetricsUnmarshaler(otlp.NewProtobufMetricsUnmarshaler(), "test") + um := newPdataMetricsUnmarshaler(otlp2.NewProtobufMetricsUnmarshaler(), "test") assert.Equal(t, "test", um.Encoding()) } func TestNewPdataLogsUnmarshaler(t *testing.T) { - um := newPdataLogsUnmarshaler(otlp.NewProtobufLogsUnmarshaler(), "test") + um := newPdataLogsUnmarshaler(otlp2.NewProtobufLogsUnmarshaler(), "test") assert.Equal(t, "test", um.Encoding()) } diff --git a/receiver/kafkareceiver/unmarshaler.go b/receiver/kafkareceiver/unmarshaler.go index 3b4ad45e113..a6bb4538745 100644 --- a/receiver/kafkareceiver/unmarshaler.go +++ b/receiver/kafkareceiver/unmarshaler.go @@ -15,7 +15,7 @@ package kafkareceiver import ( - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/trace/zipkinv1" "go.opentelemetry.io/collector/translator/trace/zipkinv2" @@ -50,7 +50,7 @@ type LogsUnmarshaler interface { // defaultTracesUnmarshalers returns map of supported encodings with TracesUnmarshaler. func defaultTracesUnmarshalers() map[string]TracesUnmarshaler { - otlpPb := newPdataTracesUnmarshaler(otlp.NewProtobufTracesUnmarshaler(), defaultEncoding) + otlpPb := newPdataTracesUnmarshaler(otlp2.NewProtobufTracesUnmarshaler(), defaultEncoding) jaegerProto := jaegerProtoSpanUnmarshaler{} jaegerJSON := jaegerJSONSpanUnmarshaler{} zipkinProto := newPdataTracesUnmarshaler(zipkinv2.NewProtobufTracesUnmarshaler(false, false), "zipkin_proto") @@ -67,14 +67,14 @@ func defaultTracesUnmarshalers() map[string]TracesUnmarshaler { } func defaultMetricsUnmarshalers() map[string]MetricsUnmarshaler { - otlpPb := newPdataMetricsUnmarshaler(otlp.NewProtobufMetricsUnmarshaler(), defaultEncoding) + otlpPb := newPdataMetricsUnmarshaler(otlp2.NewProtobufMetricsUnmarshaler(), defaultEncoding) return map[string]MetricsUnmarshaler{ otlpPb.Encoding(): otlpPb, } } func defaultLogsUnmarshalers() map[string]LogsUnmarshaler { - otlpPb := newPdataLogsUnmarshaler(otlp.NewProtobufLogsUnmarshaler(), defaultEncoding) + otlpPb := newPdataLogsUnmarshaler(otlp2.NewProtobufLogsUnmarshaler(), defaultEncoding) return map[string]LogsUnmarshaler{ otlpPb.Encoding(): otlpPb, } diff --git a/receiver/otlpreceiver/otlp.go b/receiver/otlpreceiver/otlp.go index 0796021d770..4e58408f522 100644 --- a/receiver/otlpreceiver/otlp.go +++ b/receiver/otlpreceiver/otlp.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/otlpgrpc" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics" @@ -182,8 +182,8 @@ func (r *otlpReceiver) Shutdown(ctx context.Context) error { return err } -var tracesPbUnmarshaler = otlp.NewProtobufTracesUnmarshaler() -var tracesJSONUnmarshaler = otlp.NewJSONTracesUnmarshaler() +var tracesPbUnmarshaler = otlp2.NewProtobufTracesUnmarshaler() +var tracesJSONUnmarshaler = otlp2.NewJSONTracesUnmarshaler() func (r *otlpReceiver) registerTraceConsumer(tc consumer.Traces) error { if tc == nil { @@ -209,8 +209,8 @@ func (r *otlpReceiver) registerTraceConsumer(tc consumer.Traces) error { return nil } -var metricsPbUnmarshaler = otlp.NewProtobufMetricsUnmarshaler() -var metricsJSONUnmarshaler = otlp.NewJSONMetricsUnmarshaler() +var metricsPbUnmarshaler = otlp2.NewProtobufMetricsUnmarshaler() +var metricsJSONUnmarshaler = otlp2.NewJSONMetricsUnmarshaler() func (r *otlpReceiver) registerMetricsConsumer(mc consumer.Metrics) error { if mc == nil { @@ -228,8 +228,8 @@ func (r *otlpReceiver) registerMetricsConsumer(mc consumer.Metrics) error { return nil } -var logsPbUnmarshaler = otlp.NewProtobufLogsUnmarshaler() -var logsJSONUnmarshaler = otlp.NewJSONLogsUnmarshaler() +var logsPbUnmarshaler = otlp2.NewProtobufLogsUnmarshaler() +var logsJSONUnmarshaler = otlp2.NewJSONLogsUnmarshaler() func (r *otlpReceiver) registerLogsConsumer(lc consumer.Logs) error { if lc == nil { diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index d2b3d72e9b4..c92ad96d941 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -46,8 +46,8 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" collectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" "go.opentelemetry.io/collector/internal/internalconsumertest" - "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/otlpgrpc" "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" @@ -255,7 +255,7 @@ func TestProtoHttp(t *testing.T) { <-time.After(10 * time.Millisecond) td := testdata.GenerateTracesOneSpan() - traceBytes, err := otlp.NewProtobufTracesMarshaler().MarshalTraces(td) + traceBytes, err := otlp2.NewProtobufTracesMarshaler().MarshalTraces(td) if err != nil { t.Errorf("Error marshaling protobuf: %v", err) } @@ -683,7 +683,7 @@ func TestShutdown(t *testing.T) { } senderHTTP := func(td pdata.Traces) { // Send request via OTLP/HTTP. - traceBytes, err2 := otlp.NewProtobufTracesMarshaler().MarshalTraces(td) + traceBytes, err2 := otlp2.NewProtobufTracesMarshaler().MarshalTraces(td) if err2 != nil { t.Errorf("Error marshaling protobuf: %v", err2) } diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index 3696435d318..84a0a1c637c 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/idutils" - "go.opentelemetry.io/collector/internal/otlp" + otlp2 "go.opentelemetry.io/collector/model/otlp" "go.opentelemetry.io/collector/model/pdata" ) @@ -276,17 +276,17 @@ func NewFileDataProvider(filePath string, dataType config.DataType) (*FileDataPr // Load the message from the file and count the data points. switch dataType { case config.TracesDataType: - if dp.traces, err = otlp.NewJSONTracesUnmarshaler().UnmarshalTraces(buf); err != nil { + if dp.traces, err = otlp2.NewJSONTracesUnmarshaler().UnmarshalTraces(buf); err != nil { return nil, err } dp.ItemsPerBatch = dp.traces.SpanCount() case config.MetricsDataType: - if dp.metrics, err = otlp.NewJSONMetricsUnmarshaler().UnmarshalMetrics(buf); err != nil { + if dp.metrics, err = otlp2.NewJSONMetricsUnmarshaler().UnmarshalMetrics(buf); err != nil { return nil, err } _, dp.ItemsPerBatch = dp.metrics.MetricAndDataPointCount() case config.LogsDataType: - if dp.logs, err = otlp.NewJSONLogsUnmarshaler().UnmarshalLogs(buf); err != nil { + if dp.logs, err = otlp2.NewJSONLogsUnmarshaler().UnmarshalLogs(buf); err != nil { return nil, err } dp.ItemsPerBatch = dp.logs.LogRecordCount()