Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move internal/otlp to model/otlp #3508

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Move internal/otlp to model/otlp #3508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/fileexporter/file_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/internal/otlp"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/fileexporter/file_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
)

func TestFileTracesExporter(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/kafka_exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/marshaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package kafkaexporter
import (
"github.com/Shopify/sarama"

"go.opentelemetry.io/collector/internal/otlp"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/otlphttpexporter/otlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down
0 internal/otlp/json_marshaler.go → model/otlp/json_marshaler.go
View file
Open in desktop
File renamed without changes.
0 internal/otlp/json_test.go → model/otlp/json_test.go
View file
Open in desktop
File renamed without changes.
0 internal/otlp/json_unmarshaler.go → model/otlp/json_unmarshaler.go
View file
Open in desktop
File renamed without changes.
0 internal/otlp/pb_marshaler.go → model/otlp/pb_marshaler.go
View file
Open in desktop
File renamed without changes.
0 internal/otlp/pb_test.go → model/otlp/pb_test.go
View file
Open in desktop
File renamed without changes.
0 internal/otlp/pb_unmarshaler.go → model/otlp/pb_unmarshaler.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/kafka_receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/obsreport"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/pdata_unmarshaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/stretchr/testify/assert"

"go.opentelemetry.io/collector/internal/otlp"
"go.opentelemetry.io/collector/model/otlp"
)

func TestNewPdataTracesUnmarshaler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion receiver/kafkareceiver/unmarshaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package kafkareceiver

import (
"go.opentelemetry.io/collector/internal/otlp"
"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"
Expand Down
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/otlp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"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"
Expand Down
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/otlp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/otlpgrpc"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/obsreport/obsreporttest"
Expand Down
2 changes: 1 addition & 1 deletion testbed/testbed/data_providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"go.opentelemetry.io/collector/model/otlp"
"go.opentelemetry.io/collector/model/pdata"
)

Expand Down