diff --git a/cmd/mdatagen/metrics.tmpl b/cmd/mdatagen/metrics.tmpl index 1c0066b4e15..be1abbca3a7 100644 --- a/cmd/mdatagen/metrics.tmpl +++ b/cmd/mdatagen/metrics.tmpl @@ -18,7 +18,7 @@ package {{ .Package }} import ( "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Type is the component type name. diff --git a/cmd/pdatagen/main.go b/cmd/pdatagen/main.go index 02a4fcabad4..3b4101a7426 100644 --- a/cmd/pdatagen/main.go +++ b/cmd/pdatagen/main.go @@ -28,12 +28,12 @@ func check(e error) { func main() { for _, fp := range internal.AllFiles { - f, err := os.Create("./consumer/pdata/generated_" + fp.Name + ".go") + f, err := os.Create("./model/pdata/generated_" + fp.Name + ".go") check(err) _, err = f.WriteString(fp.GenerateFile()) check(err) check(f.Close()) - f, err = os.Create("./consumer/pdata/generated_" + fp.Name + "_test.go") + f, err = os.Create("./model/pdata/generated_" + fp.Name + "_test.go") check(err) _, err = f.WriteString(fp.GenerateTestFile()) check(err) diff --git a/component/componenttest/nop_exporter_test.go b/component/componenttest/nop_exporter_test.go index 830b0184103..d586f21f3c1 100644 --- a/component/componenttest/nop_exporter_test.go +++ b/component/componenttest/nop_exporter_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNewNopExporterFactory(t *testing.T) { diff --git a/component/componenttest/nop_processor_test.go b/component/componenttest/nop_processor_test.go index a3b60548cab..cc9ecfd5a3d 100644 --- a/component/componenttest/nop_processor_test.go +++ b/component/componenttest/nop_processor_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNewNopProcessorFactory(t *testing.T) { diff --git a/config/configgrpc/configgrpc_test.go b/config/configgrpc/configgrpc_test.go index 9bd868856c1..b474190f186 100644 --- a/config/configgrpc/configgrpc_test.go +++ b/config/configgrpc/configgrpc_test.go @@ -32,8 +32,8 @@ import ( "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" + "go.opentelemetry.io/collector/model/pdata" ) func TestDefaultGrpcClientSettings(t *testing.T) { diff --git a/consumer/consumer.go b/consumer/consumer.go index bf907473fc0..b079981c07a 100644 --- a/consumer/consumer.go +++ b/consumer/consumer.go @@ -17,7 +17,7 @@ package consumer import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Capabilities describes the capabilities of a Processor. diff --git a/consumer/consumererror/signalerrors.go b/consumer/consumererror/signalerrors.go index a1924f1345e..a1b1f47c130 100644 --- a/consumer/consumererror/signalerrors.go +++ b/consumer/consumererror/signalerrors.go @@ -17,7 +17,7 @@ package consumererror import ( "errors" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Traces is an error that may carry associated Trace data for a subset of received data diff --git a/consumer/consumerhelper/logs.go b/consumer/consumerhelper/logs.go index b04b6ad51fc..3b29b3338d5 100644 --- a/consumer/consumerhelper/logs.go +++ b/consumer/consumerhelper/logs.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // ConsumeLogsFunc is a helper function that is similar to ConsumeLogs. diff --git a/consumer/consumerhelper/logs_test.go b/consumer/consumerhelper/logs_test.go index d712628260a..695a398b7ec 100644 --- a/consumer/consumerhelper/logs_test.go +++ b/consumer/consumerhelper/logs_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestDefaultLogs(t *testing.T) { diff --git a/consumer/consumerhelper/metrics.go b/consumer/consumerhelper/metrics.go index 4076c999dd7..6db7931807d 100644 --- a/consumer/consumerhelper/metrics.go +++ b/consumer/consumerhelper/metrics.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // ConsumeMetricsFunc is a helper function that is similar to ConsumeMetrics. diff --git a/consumer/consumerhelper/metrics_test.go b/consumer/consumerhelper/metrics_test.go index fd3d58c80a2..c74544f7efc 100644 --- a/consumer/consumerhelper/metrics_test.go +++ b/consumer/consumerhelper/metrics_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestDefaultMetrics(t *testing.T) { diff --git a/consumer/consumerhelper/traces.go b/consumer/consumerhelper/traces.go index fd85f3eada6..4756fdfeded 100644 --- a/consumer/consumerhelper/traces.go +++ b/consumer/consumerhelper/traces.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // ConsumeTracesFunc is a helper function that is similar to ConsumeTraces. diff --git a/consumer/consumerhelper/traces_test.go b/consumer/consumerhelper/traces_test.go index c4a14e1f997..af3114b1c50 100644 --- a/consumer/consumerhelper/traces_test.go +++ b/consumer/consumerhelper/traces_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestDefaultTraces(t *testing.T) { diff --git a/consumer/consumertest/consumer.go b/consumer/consumertest/consumer.go index f79972ce4f2..ee5125b4ba5 100644 --- a/consumer/consumertest/consumer.go +++ b/consumer/consumertest/consumer.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Consumer is a convenience interface that implements all consumer interfaces. diff --git a/consumer/consumertest/err.go b/consumer/consumertest/err.go index 12abb5bb05f..21d5a2d5fb0 100644 --- a/consumer/consumertest/err.go +++ b/consumer/consumertest/err.go @@ -17,7 +17,7 @@ package consumertest import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type errConsumer struct { diff --git a/consumer/consumertest/err_test.go b/consumer/consumertest/err_test.go index 0601e2d465b..382b3809086 100644 --- a/consumer/consumertest/err_test.go +++ b/consumer/consumertest/err_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestErr(t *testing.T) { diff --git a/consumer/consumertest/nop.go b/consumer/consumertest/nop.go index 9415aeed3c7..106b1c090b3 100644 --- a/consumer/consumertest/nop.go +++ b/consumer/consumertest/nop.go @@ -17,7 +17,7 @@ package consumertest import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/consumer/consumertest/nop_test.go b/consumer/consumertest/nop_test.go index 1c7f4687592..a16b129808a 100644 --- a/consumer/consumertest/nop_test.go +++ b/consumer/consumertest/nop_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNop(t *testing.T) { diff --git a/consumer/consumertest/sink.go b/consumer/consumertest/sink.go index 8d0232a7b74..78eb2fbc779 100644 --- a/consumer/consumertest/sink.go +++ b/consumer/consumertest/sink.go @@ -19,7 +19,7 @@ import ( "sync" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // TracesSink is a consumer.Traces that acts like a sink that diff --git a/consumer/consumertest/sink_test.go b/consumer/consumertest/sink_test.go index 75b6e86dae6..712ab3a76e4 100644 --- a/consumer/consumertest/sink_test.go +++ b/consumer/consumertest/sink_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestTracesSink(t *testing.T) { diff --git a/consumer/simple/metrics.go b/consumer/simple/metrics.go index 0fa3083fbb4..4cbd34bed75 100644 --- a/consumer/simple/metrics.go +++ b/consumer/simple/metrics.go @@ -18,7 +18,7 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Metrics facilitates building pdata.Metrics in receivers. It is meant diff --git a/consumer/simple/metrics_test.go b/consumer/simple/metrics_test.go index 3621ac79daf..e661ff5d44f 100644 --- a/consumer/simple/metrics_test.go +++ b/consumer/simple/metrics_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testutil/metricstestutil" ) diff --git a/exporter/exporterhelper/factory_test.go b/exporter/exporterhelper/factory_test.go index 73de3280bdb..da5e4d2d8c5 100644 --- a/exporter/exporterhelper/factory_test.go +++ b/exporter/exporterhelper/factory_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const typeStr = "test" diff --git a/exporter/exporterhelper/logs.go b/exporter/exporterhelper/logs.go index d2797c6b477..9777dcb9427 100644 --- a/exporter/exporterhelper/logs.go +++ b/exporter/exporterhelper/logs.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type logsRequest struct { diff --git a/exporter/exporterhelper/logs_test.go b/exporter/exporterhelper/logs_test.go index 3767625444e..2fb598e5553 100644 --- a/exporter/exporterhelper/logs_test.go +++ b/exporter/exporterhelper/logs_test.go @@ -29,9 +29,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) diff --git a/exporter/exporterhelper/metrics.go b/exporter/exporterhelper/metrics.go index 1a23b8e6a43..f5436667822 100644 --- a/exporter/exporterhelper/metrics.go +++ b/exporter/exporterhelper/metrics.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type metricsRequest struct { diff --git a/exporter/exporterhelper/metrics_test.go b/exporter/exporterhelper/metrics_test.go index d8ce822ec54..03fa591c380 100644 --- a/exporter/exporterhelper/metrics_test.go +++ b/exporter/exporterhelper/metrics_test.go @@ -29,9 +29,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) diff --git a/exporter/exporterhelper/resource_to_label.go b/exporter/exporterhelper/resource_to_label.go index 0c4b6bd8e08..d1af9c357ef 100644 --- a/exporter/exporterhelper/resource_to_label.go +++ b/exporter/exporterhelper/resource_to_label.go @@ -15,7 +15,7 @@ package exporterhelper import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/exporter/exporterhelper/traces.go b/exporter/exporterhelper/traces.go index 8f67b4484a3..b25cada8bae 100644 --- a/exporter/exporterhelper/traces.go +++ b/exporter/exporterhelper/traces.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type tracesRequest struct { diff --git a/exporter/exporterhelper/traces_test.go b/exporter/exporterhelper/traces_test.go index 39e93f441f0..c9280fda9e3 100644 --- a/exporter/exporterhelper/traces_test.go +++ b/exporter/exporterhelper/traces_test.go @@ -30,9 +30,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" ) diff --git a/exporter/fileexporter/file_exporter.go b/exporter/fileexporter/file_exporter.go index 49c7018928d..ae7829c2d8b 100644 --- a/exporter/fileexporter/file_exporter.go +++ b/exporter/fileexporter/file_exporter.go @@ -22,8 +22,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/otlp" + "go.opentelemetry.io/collector/model/pdata" ) // Marshaler configuration used for marhsaling Protobuf to JSON. diff --git a/exporter/jaegerexporter/exporter.go b/exporter/jaegerexporter/exporter.go index cedfee98366..0609a16f03f 100644 --- a/exporter/jaegerexporter/exporter.go +++ b/exporter/jaegerexporter/exporter.go @@ -32,8 +32,8 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/model/pdata" jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger" ) diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index bc78de3b284..77ee3c476e4 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -35,8 +35,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNew(t *testing.T) { diff --git a/exporter/kafkaexporter/factory_test.go b/exporter/kafkaexporter/factory_test.go index a0480541139..3eacc99f0a2 100644 --- a/exporter/kafkaexporter/factory_test.go +++ b/exporter/kafkaexporter/factory_test.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/exporter/kafkaexporter/jaeger_marshaler.go b/exporter/kafkaexporter/jaeger_marshaler.go index 6943a6ff285..c118df8c89c 100644 --- a/exporter/kafkaexporter/jaeger_marshaler.go +++ b/exporter/kafkaexporter/jaeger_marshaler.go @@ -22,7 +22,7 @@ import ( jaegerproto "github.com/jaegertracing/jaeger/model" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger" ) diff --git a/exporter/kafkaexporter/jaeger_marshaler_test.go b/exporter/kafkaexporter/jaeger_marshaler_test.go index 5aa25968e60..7fd1d2efd30 100644 --- a/exporter/kafkaexporter/jaeger_marshaler_test.go +++ b/exporter/kafkaexporter/jaeger_marshaler_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger" ) diff --git a/exporter/kafkaexporter/kafka_exporter.go b/exporter/kafkaexporter/kafka_exporter.go index 087dc75d713..50921e24434 100644 --- a/exporter/kafkaexporter/kafka_exporter.go +++ b/exporter/kafkaexporter/kafka_exporter.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var errUnrecognizedEncoding = fmt.Errorf("unrecognized encoding") diff --git a/exporter/kafkaexporter/kafka_exporter_test.go b/exporter/kafkaexporter/kafka_exporter_test.go index 718cdf9be31..baf2002bbbe 100644 --- a/exporter/kafkaexporter/kafka_exporter_test.go +++ b/exporter/kafkaexporter/kafka_exporter_test.go @@ -27,9 +27,9 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNewExporter_err_version(t *testing.T) { diff --git a/exporter/kafkaexporter/marshaler.go b/exporter/kafkaexporter/marshaler.go index e3123ef7f23..1906bbe6d65 100644 --- a/exporter/kafkaexporter/marshaler.go +++ b/exporter/kafkaexporter/marshaler.go @@ -17,8 +17,8 @@ package kafkaexporter import ( "github.com/Shopify/sarama" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/otlp" + "go.opentelemetry.io/collector/model/pdata" ) // TracesMarshaler marshals traces into Message array. diff --git a/exporter/kafkaexporter/pdata_marshaler.go b/exporter/kafkaexporter/pdata_marshaler.go index eaab902dbac..a45466a5d5c 100644 --- a/exporter/kafkaexporter/pdata_marshaler.go +++ b/exporter/kafkaexporter/pdata_marshaler.go @@ -17,7 +17,7 @@ package kafkaexporter import ( "github.com/Shopify/sarama" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type pdataLogsMarshaler struct { diff --git a/exporter/loggingexporter/logging_exporter.go b/exporter/loggingexporter/logging_exporter.go index 9249d44a065..366e3330d52 100644 --- a/exporter/loggingexporter/logging_exporter.go +++ b/exporter/loggingexporter/logging_exporter.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/otlptext" + "go.opentelemetry.io/collector/model/pdata" ) type loggingExporter struct { diff --git a/exporter/loggingexporter/logging_exporter_test.go b/exporter/loggingexporter/logging_exporter_test.go index cde7da2afde..f38bb06ea08 100644 --- a/exporter/loggingexporter/logging_exporter_test.go +++ b/exporter/loggingexporter/logging_exporter_test.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestLoggingTracesExporterNoErrors(t *testing.T) { diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index ca1c28f3e7b..eeff52e177e 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/metadata" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/internaldata" ) diff --git a/exporter/otlpexporter/otlp.go b/exporter/otlpexporter/otlp.go index 8502d8b397f..aa13028d845 100644 --- a/exporter/otlpexporter/otlp.go +++ b/exporter/otlpexporter/otlp.go @@ -29,9 +29,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/pdatagrpc" + "go.opentelemetry.io/collector/model/pdata" ) type exporter struct { diff --git a/exporter/otlpexporter/otlp_test.go b/exporter/otlpexporter/otlp_test.go index 4f147ae385e..4ee6612cf3d 100644 --- a/exporter/otlpexporter/otlp_test.go +++ b/exporter/otlpexporter/otlp_test.go @@ -31,9 +31,9 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) type mockReceiver struct { diff --git a/exporter/otlphttpexporter/otlp.go b/exporter/otlphttpexporter/otlp.go index 18cd923e6cd..7e7e4093c04 100644 --- a/exporter/otlphttpexporter/otlp.go +++ b/exporter/otlphttpexporter/otlp.go @@ -35,10 +35,10 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/middleware" "go.opentelemetry.io/collector/internal/otlp" + "go.opentelemetry.io/collector/model/pdata" ) type exporter struct { diff --git a/exporter/otlphttpexporter/otlp_test.go b/exporter/otlphttpexporter/otlp_test.go index 4b872b2cced..e19ffe73410 100644 --- a/exporter/otlphttpexporter/otlp_test.go +++ b/exporter/otlphttpexporter/otlp_test.go @@ -36,9 +36,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/collector/testutil" ) diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go index 3652d05f374..bddc339885d 100644 --- a/exporter/prometheusexporter/accumulator.go +++ b/exporter/prometheusexporter/accumulator.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type accumulatedValue struct { diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index da618b11ebb..049ef0b262d 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestInvalidDataType(t *testing.T) { diff --git a/exporter/prometheusexporter/collector.go b/exporter/prometheusexporter/collector.go index 921042180f1..8a0a500a5f6 100644 --- a/exporter/prometheusexporter/collector.go +++ b/exporter/prometheusexporter/collector.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type collector struct { diff --git a/exporter/prometheusexporter/collector_test.go b/exporter/prometheusexporter/collector_test.go index 44dadd894bb..22ba5184fe9 100644 --- a/exporter/prometheusexporter/collector_test.go +++ b/exporter/prometheusexporter/collector_test.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type mockAccumulator struct { diff --git a/exporter/prometheusexporter/prometheus.go b/exporter/prometheusexporter/prometheus.go index aa8bee2ede0..4d6d9b9c40e 100644 --- a/exporter/prometheusexporter/prometheus.go +++ b/exporter/prometheusexporter/prometheus.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index f8d81e540a9..262e25e5353 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -35,7 +35,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const maxBatchByteSize = 3000000 diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index 1eda3f6e9b8..fa65e144ab8 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -34,9 +34,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) // Test_NewPRWExporter checks that a new exporter instance with non-nil fields is initialized diff --git a/exporter/prometheusremotewriteexporter/helper.go b/exporter/prometheusremotewriteexporter/helper.go index a3fd17f66b0..4d5ebd2f5a3 100644 --- a/exporter/prometheusremotewriteexporter/helper.go +++ b/exporter/prometheusremotewriteexporter/helper.go @@ -26,7 +26,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/prompb" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const ( diff --git a/exporter/prometheusremotewriteexporter/helper_test.go b/exporter/prometheusremotewriteexporter/helper_test.go index 16d5a8a6b4d..d077d432e66 100644 --- a/exporter/prometheusremotewriteexporter/helper_test.go +++ b/exporter/prometheusremotewriteexporter/helper_test.go @@ -20,7 +20,7 @@ import ( "github.com/prometheus/prometheus/prompb" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Test_validateMetrics checks validateMetrics return true if a type and temporality combination is valid, false diff --git a/exporter/prometheusremotewriteexporter/testutil_test.go b/exporter/prometheusremotewriteexporter/testutil_test.go index 754eaed4cfa..5cd5734bb90 100644 --- a/exporter/prometheusremotewriteexporter/testutil_test.go +++ b/exporter/prometheusremotewriteexporter/testutil_test.go @@ -20,7 +20,7 @@ import ( "github.com/prometheus/prometheus/prompb" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index 91bc69ab04b..ba6438d64f4 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/trace/zipkinv2" ) diff --git a/internal/goldendataset/metrics_gen.go b/internal/goldendataset/metrics_gen.go index f55acd2039a..62e32a7fc65 100644 --- a/internal/goldendataset/metrics_gen.go +++ b/internal/goldendataset/metrics_gen.go @@ -17,7 +17,7 @@ package goldendataset import ( "fmt" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Simple utilities for generating metrics for testing diff --git a/internal/goldendataset/metrics_gen_test.go b/internal/goldendataset/metrics_gen_test.go index 441ba507caf..4f1ca8f504c 100644 --- a/internal/goldendataset/metrics_gen_test.go +++ b/internal/goldendataset/metrics_gen_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestGenDefault(t *testing.T) { diff --git a/internal/goldendataset/pict_metrics_gen.go b/internal/goldendataset/pict_metrics_gen.go index b84c53ff656..d6ebaaa7be4 100644 --- a/internal/goldendataset/pict_metrics_gen.go +++ b/internal/goldendataset/pict_metrics_gen.go @@ -17,7 +17,7 @@ package goldendataset import ( "fmt" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // GenerateMetrics takes the filename of a PICT-generated file, walks through all of the rows in the PICT diff --git a/internal/goldendataset/pict_metrics_gen_test.go b/internal/goldendataset/pict_metrics_gen_test.go index 7659c3e88bf..51072765a03 100644 --- a/internal/goldendataset/pict_metrics_gen_test.go +++ b/internal/goldendataset/pict_metrics_gen_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestGenerateMetricDatas(t *testing.T) { diff --git a/internal/goldendataset/resource_generator.go b/internal/goldendataset/resource_generator.go index 37d3d19a872..35ef2201c7d 100644 --- a/internal/goldendataset/resource_generator.go +++ b/internal/goldendataset/resource_generator.go @@ -15,7 +15,7 @@ package goldendataset import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/goldendataset/span_generator.go b/internal/goldendataset/span_generator.go index e013f698eb7..06269688de7 100644 --- a/internal/goldendataset/span_generator.go +++ b/internal/goldendataset/span_generator.go @@ -19,7 +19,7 @@ import ( "io" "time" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/goldendataset/span_generator_test.go b/internal/goldendataset/span_generator_test.go index f42fa3d130a..0ad5c4b829f 100644 --- a/internal/goldendataset/span_generator_test.go +++ b/internal/goldendataset/span_generator_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestGenerateParentSpan(t *testing.T) { diff --git a/internal/goldendataset/traces_generator.go b/internal/goldendataset/traces_generator.go index dcc1c00362a..16d544b20c9 100644 --- a/internal/goldendataset/traces_generator.go +++ b/internal/goldendataset/traces_generator.go @@ -19,7 +19,7 @@ import ( "io" "math/rand" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // GenerateTraces generates a slice of OTLP ResourceSpans objects based on the PICT-generated pairwise diff --git a/internal/idutils/big_endian_converter.go b/internal/idutils/big_endian_converter.go index abc9d9bfc33..13e0aea2878 100644 --- a/internal/idutils/big_endian_converter.go +++ b/internal/idutils/big_endian_converter.go @@ -17,7 +17,7 @@ package idutils import ( "encoding/binary" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // UInt64ToTraceID converts the pair of uint64 representation of a TraceID to pdata.TraceID. diff --git a/internal/idutils/big_endian_converter_test.go b/internal/idutils/big_endian_converter_test.go index 861110298c3..99f713dffdf 100644 --- a/internal/idutils/big_endian_converter_test.go +++ b/internal/idutils/big_endian_converter_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestUInt64ToTraceIDConversion(t *testing.T) { diff --git a/internal/internalconsumertest/err_or_sink_consumer.go b/internal/internalconsumertest/err_or_sink_consumer.go index 8c01f84d055..ddb2ca5cb72 100644 --- a/internal/internalconsumertest/err_or_sink_consumer.go +++ b/internal/internalconsumertest/err_or_sink_consumer.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type ErrOrSinkConsumer struct { diff --git a/internal/otlp/from_translator.go b/internal/otlp/from_translator.go index c193487d054..d3ab333f13c 100644 --- a/internal/otlp/from_translator.go +++ b/internal/otlp/from_translator.go @@ -15,8 +15,8 @@ package otlp import ( - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" + "go.opentelemetry.io/collector/model/pdata" ) type fromTranslator struct{} diff --git a/internal/otlp/json_encoder.go b/internal/otlp/json_encoder.go index b70d1da652a..555b187fc0d 100644 --- a/internal/otlp/json_encoder.go +++ b/internal/otlp/json_encoder.go @@ -19,10 +19,10 @@ import ( "github.com/gogo/protobuf/jsonpb" - "go.opentelemetry.io/collector/consumer/pdata" otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1" otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" + "go.opentelemetry.io/collector/model/pdata" ) type jsonEncoder struct { diff --git a/internal/otlp/json_test.go b/internal/otlp/json_test.go index b4365f32e34..d8335ff5e16 100644 --- a/internal/otlp/json_test.go +++ b/internal/otlp/json_test.go @@ -19,7 +19,6 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1" otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" @@ -28,6 +27,7 @@ import ( otlpmetrics "go.opentelemetry.io/collector/internal/data/protogen/metrics/v1" otlpresource "go.opentelemetry.io/collector/internal/data/protogen/resource/v1" otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/otlp/marshaler.go b/internal/otlp/marshaler.go index 1c363910a8e..0afc7855489 100644 --- a/internal/otlp/marshaler.go +++ b/internal/otlp/marshaler.go @@ -15,7 +15,7 @@ package otlp import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewJSONTracesMarshaler returns a model.TracesMarshaler. Marshals to OTLP json bytes. diff --git a/internal/otlp/pb_encoder.go b/internal/otlp/pb_encoder.go index dbed24a8359..5c816d4c030 100644 --- a/internal/otlp/pb_encoder.go +++ b/internal/otlp/pb_encoder.go @@ -15,10 +15,10 @@ package otlp import ( - "go.opentelemetry.io/collector/consumer/pdata" otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1" otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" + "go.opentelemetry.io/collector/model/pdata" ) type pbEncoder struct{} diff --git a/internal/otlp/to_translator.go b/internal/otlp/to_translator.go index 720116ad259..373b31c086f 100644 --- a/internal/otlp/to_translator.go +++ b/internal/otlp/to_translator.go @@ -15,11 +15,11 @@ package otlp import ( - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1" otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" + "go.opentelemetry.io/collector/model/pdata" ) type toTranslator struct{} diff --git a/internal/otlp/unmarshaler.go b/internal/otlp/unmarshaler.go index 45af9e6774e..c863990ebaf 100644 --- a/internal/otlp/unmarshaler.go +++ b/internal/otlp/unmarshaler.go @@ -15,7 +15,7 @@ package otlp import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewJSONTracesUnmarshaler returns a model.TracesUnmarshaler. Unmarshals from OTLP json bytes. diff --git a/internal/otlptext/databuffer.go b/internal/otlptext/databuffer.go index e0ded503b31..1c0b530d138 100644 --- a/internal/otlptext/databuffer.go +++ b/internal/otlptext/databuffer.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/internal/otlptext/databuffer_test.go b/internal/otlptext/databuffer_test.go index 9e49c194895..3873f1aeb5a 100644 --- a/internal/otlptext/databuffer_test.go +++ b/internal/otlptext/databuffer_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestNestedArraySerializesCorrectly(t *testing.T) { diff --git a/internal/otlptext/logs.go b/internal/otlptext/logs.go index 789a4a73f18..1aa33b1343a 100644 --- a/internal/otlptext/logs.go +++ b/internal/otlptext/logs.go @@ -15,7 +15,7 @@ package otlptext import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewTextLogsMarshaler returns a serializer.LogsMarshaler to encode to OTLP json bytes. diff --git a/internal/otlptext/logs_test.go b/internal/otlptext/logs_test.go index 69c29fd630a..bc344e5bec3 100644 --- a/internal/otlptext/logs_test.go +++ b/internal/otlptext/logs_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestLogs(t *testing.T) { diff --git a/internal/otlptext/metrics.go b/internal/otlptext/metrics.go index 47536bc231d..facb794500f 100644 --- a/internal/otlptext/metrics.go +++ b/internal/otlptext/metrics.go @@ -15,7 +15,7 @@ package otlptext import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewTextMetricsMarshaler returns a serializer.MetricsMarshaler to encode to OTLP json bytes. diff --git a/internal/otlptext/metrics_test.go b/internal/otlptext/metrics_test.go index 4032318956b..4361b9ed7ec 100644 --- a/internal/otlptext/metrics_test.go +++ b/internal/otlptext/metrics_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestMetrics(t *testing.T) { diff --git a/internal/otlptext/traces.go b/internal/otlptext/traces.go index 0c3189bdadc..c4ddf0d3695 100644 --- a/internal/otlptext/traces.go +++ b/internal/otlptext/traces.go @@ -15,7 +15,7 @@ package otlptext import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewTextTracesMarshaler returns a serializer.TracesMarshaler to encode to OTLP json bytes. diff --git a/internal/otlptext/traces_test.go b/internal/otlptext/traces_test.go index b25998b7093..3591f94831d 100644 --- a/internal/otlptext/traces_test.go +++ b/internal/otlptext/traces_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestTraces(t *testing.T) { diff --git a/internal/pdatagrpc/logs.go b/internal/pdatagrpc/logs.go index b59d4cfd8aa..6b2009f9dab 100644 --- a/internal/pdatagrpc/logs.go +++ b/internal/pdatagrpc/logs.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1" + "go.opentelemetry.io/collector/model/pdata" ) // TODO: Consider to add `LogsRequest`. If we add non pdata properties we can add them to the request. diff --git a/internal/pdatagrpc/metrics.go b/internal/pdatagrpc/metrics.go index ba54e883a92..46c212810b3 100644 --- a/internal/pdatagrpc/metrics.go +++ b/internal/pdatagrpc/metrics.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1" + "go.opentelemetry.io/collector/model/pdata" ) // TODO: Consider to add `MetricsRequest`. If we add non pdata properties we can add them to the request. diff --git a/internal/pdatagrpc/traces.go b/internal/pdatagrpc/traces.go index 513fe6f7df3..c581073aa79 100644 --- a/internal/pdatagrpc/traces.go +++ b/internal/pdatagrpc/traces.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal" otlpcollectortraces "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" + "go.opentelemetry.io/collector/model/pdata" ) // TODO: Consider to add `TracesRequest`. If we add non pdata properties we can add them to the request. diff --git a/internal/processor/filterexpr/matcher.go b/internal/processor/filterexpr/matcher.go index c84212abe9b..be32d8d8939 100644 --- a/internal/processor/filterexpr/matcher.go +++ b/internal/processor/filterexpr/matcher.go @@ -18,7 +18,7 @@ import ( "github.com/antonmedv/expr" "github.com/antonmedv/expr/vm" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type Matcher struct { diff --git a/internal/processor/filterexpr/matcher_test.go b/internal/processor/filterexpr/matcher_test.go index f05b5481a70..fee907c6695 100644 --- a/internal/processor/filterexpr/matcher_test.go +++ b/internal/processor/filterexpr/matcher_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestCompileExprError(t *testing.T) { diff --git a/internal/processor/filterhelper/filterhelper.go b/internal/processor/filterhelper/filterhelper.go index fca006d36c4..393d32d945a 100644 --- a/internal/processor/filterhelper/filterhelper.go +++ b/internal/processor/filterhelper/filterhelper.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/cast" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewAttributeValueRaw is used to convert the raw `value` from ActionKeyValue to the supported trace attribute values. diff --git a/internal/processor/filterhelper/filterhelper_test.go b/internal/processor/filterhelper/filterhelper_test.go index 6d0eeba9886..0b370ef8c59 100644 --- a/internal/processor/filterhelper/filterhelper_test.go +++ b/internal/processor/filterhelper/filterhelper_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestHelper_AttributeValue(t *testing.T) { diff --git a/internal/processor/filterlog/filterlog.go b/internal/processor/filterlog/filterlog.go index bcb1ed3f5ad..96aae6a60f0 100644 --- a/internal/processor/filterlog/filterlog.go +++ b/internal/processor/filterlog/filterlog.go @@ -17,10 +17,10 @@ package filterlog import ( "fmt" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filtermatcher" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) // Matcher is an interface that allows matching a log record against a diff --git a/internal/processor/filterlog/filterlog_test.go b/internal/processor/filterlog/filterlog_test.go index ef14afed163..61678444a7e 100644 --- a/internal/processor/filterlog/filterlog_test.go +++ b/internal/processor/filterlog/filterlog_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) func createConfig(matchType filterset.MatchType) *filterset.Config { diff --git a/internal/processor/filtermatcher/attributematcher.go b/internal/processor/filtermatcher/attributematcher.go index 96b77fe76dd..3b8f301b734 100644 --- a/internal/processor/filtermatcher/attributematcher.go +++ b/internal/processor/filtermatcher/attributematcher.go @@ -19,10 +19,10 @@ import ( "fmt" "strconv" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterhelper" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) type AttributesMatcher []AttributeMatcher diff --git a/internal/processor/filtermatcher/filtermatcher.go b/internal/processor/filtermatcher/filtermatcher.go index 9f192318d8e..a809867693d 100644 --- a/internal/processor/filtermatcher/filtermatcher.go +++ b/internal/processor/filtermatcher/filtermatcher.go @@ -17,9 +17,9 @@ package filtermatcher import ( "fmt" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) type instrumentationLibraryMatcher struct { diff --git a/internal/processor/filtermatcher/filtermatcher_test.go b/internal/processor/filtermatcher/filtermatcher_test.go index 31102381d71..db173d2055a 100644 --- a/internal/processor/filtermatcher/filtermatcher_test.go +++ b/internal/processor/filtermatcher/filtermatcher_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/processor/filtermetric/expr_matcher.go b/internal/processor/filtermetric/expr_matcher.go index 50352293d88..2eb0cc869f4 100644 --- a/internal/processor/filtermetric/expr_matcher.go +++ b/internal/processor/filtermetric/expr_matcher.go @@ -15,8 +15,8 @@ package filtermetric import ( - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterexpr" + "go.opentelemetry.io/collector/model/pdata" ) type exprMatcher struct { diff --git a/internal/processor/filtermetric/filtermetric.go b/internal/processor/filtermetric/filtermetric.go index ec9c176ccf7..6983aeb7b83 100644 --- a/internal/processor/filtermetric/filtermetric.go +++ b/internal/processor/filtermetric/filtermetric.go @@ -15,7 +15,7 @@ package filtermetric import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type Matcher interface { diff --git a/internal/processor/filtermetric/filtermetric_test.go b/internal/processor/filtermetric/filtermetric_test.go index cdc82af1765..f7ea026c7a4 100644 --- a/internal/processor/filtermetric/filtermetric_test.go +++ b/internal/processor/filtermetric/filtermetric_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/internal/processor/filtermetric/name_matcher.go b/internal/processor/filtermetric/name_matcher.go index 41b99407827..3daa1bf84ee 100644 --- a/internal/processor/filtermetric/name_matcher.go +++ b/internal/processor/filtermetric/name_matcher.go @@ -15,8 +15,8 @@ package filtermetric import ( - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" ) // nameMatcher matches metrics by metric properties against prespecified values for each property. diff --git a/internal/processor/filterspan/filterspan.go b/internal/processor/filterspan/filterspan.go index 7f2e2bfac76..9092ed624ea 100644 --- a/internal/processor/filterspan/filterspan.go +++ b/internal/processor/filterspan/filterspan.go @@ -17,10 +17,10 @@ package filterspan import ( "fmt" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filtermatcher" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/processor/filterspan/filterspan_test.go b/internal/processor/filterspan/filterspan_test.go index 7ce75dd805c..c7f92d6694b 100644 --- a/internal/processor/filterspan/filterspan_test.go +++ b/internal/processor/filterspan/filterspan_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/internal/testcomponents/example_exporter.go b/internal/testcomponents/example_exporter.go index 159f3cd1c0e..d5c0cc9a13a 100644 --- a/internal/testcomponents/example_exporter.go +++ b/internal/testcomponents/example_exporter.go @@ -21,8 +21,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configparser" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/exporterhelper" + "go.opentelemetry.io/collector/model/pdata" ) var _ config.CustomUnmarshable = (*ExampleExporter)(nil) diff --git a/internal/testcomponents/example_exporter_test.go b/internal/testcomponents/example_exporter_test.go index fccbcd94565..48ae7907b34 100644 --- a/internal/testcomponents/example_exporter_test.go +++ b/internal/testcomponents/example_exporter_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestExampleExporterConsumer(t *testing.T) { diff --git a/internal/testdata/common.go b/internal/testdata/common.go index 4fec47ee7f7..ced24a4eb13 100644 --- a/internal/testdata/common.go +++ b/internal/testdata/common.go @@ -15,7 +15,7 @@ package testdata import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/internal/testdata/log.go b/internal/testdata/log.go index b268f905923..7d683bd1e66 100644 --- a/internal/testdata/log.go +++ b/internal/testdata/log.go @@ -17,7 +17,7 @@ package testdata import ( "time" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/internal/testdata/metric.go b/internal/testdata/metric.go index 36c00f3a409..815de6de763 100644 --- a/internal/testdata/metric.go +++ b/internal/testdata/metric.go @@ -17,7 +17,7 @@ package testdata import ( "time" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/internal/testdata/resource.go b/internal/testdata/resource.go index 1e363fc2449..f5d2b8f726d 100644 --- a/internal/testdata/resource.go +++ b/internal/testdata/resource.go @@ -15,7 +15,7 @@ package testdata import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func initResource1(r pdata.Resource) { diff --git a/internal/testdata/trace.go b/internal/testdata/trace.go index b3c224a15aa..937af824ef1 100644 --- a/internal/testdata/trace.go +++ b/internal/testdata/trace.go @@ -17,7 +17,7 @@ package testdata import ( "time" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var ( diff --git a/consumer/pdata/common.go b/model/pdata/common.go similarity index 100% rename from consumer/pdata/common.go rename to model/pdata/common.go diff --git a/consumer/pdata/common_test.go b/model/pdata/common_test.go similarity index 100% rename from consumer/pdata/common_test.go rename to model/pdata/common_test.go diff --git a/consumer/pdata/doc.go b/model/pdata/doc.go similarity index 100% rename from consumer/pdata/doc.go rename to model/pdata/doc.go diff --git a/consumer/pdata/errors.go b/model/pdata/errors.go similarity index 100% rename from consumer/pdata/errors.go rename to model/pdata/errors.go diff --git a/consumer/pdata/errors_test.go b/model/pdata/errors_test.go similarity index 100% rename from consumer/pdata/errors_test.go rename to model/pdata/errors_test.go diff --git a/consumer/pdata/generated_common.go b/model/pdata/generated_common.go similarity index 100% rename from consumer/pdata/generated_common.go rename to model/pdata/generated_common.go diff --git a/consumer/pdata/generated_common_test.go b/model/pdata/generated_common_test.go similarity index 100% rename from consumer/pdata/generated_common_test.go rename to model/pdata/generated_common_test.go diff --git a/consumer/pdata/generated_log.go b/model/pdata/generated_log.go similarity index 100% rename from consumer/pdata/generated_log.go rename to model/pdata/generated_log.go diff --git a/consumer/pdata/generated_log_test.go b/model/pdata/generated_log_test.go similarity index 100% rename from consumer/pdata/generated_log_test.go rename to model/pdata/generated_log_test.go diff --git a/consumer/pdata/generated_metrics.go b/model/pdata/generated_metrics.go similarity index 100% rename from consumer/pdata/generated_metrics.go rename to model/pdata/generated_metrics.go diff --git a/consumer/pdata/generated_metrics_test.go b/model/pdata/generated_metrics_test.go similarity index 100% rename from consumer/pdata/generated_metrics_test.go rename to model/pdata/generated_metrics_test.go diff --git a/consumer/pdata/generated_resource.go b/model/pdata/generated_resource.go similarity index 100% rename from consumer/pdata/generated_resource.go rename to model/pdata/generated_resource.go diff --git a/consumer/pdata/generated_resource_test.go b/model/pdata/generated_resource_test.go similarity index 100% rename from consumer/pdata/generated_resource_test.go rename to model/pdata/generated_resource_test.go diff --git a/consumer/pdata/generated_trace.go b/model/pdata/generated_trace.go similarity index 100% rename from consumer/pdata/generated_trace.go rename to model/pdata/generated_trace.go diff --git a/consumer/pdata/generated_trace_test.go b/model/pdata/generated_trace_test.go similarity index 100% rename from consumer/pdata/generated_trace_test.go rename to model/pdata/generated_trace_test.go diff --git a/consumer/pdata/logs.go b/model/pdata/logs.go similarity index 100% rename from consumer/pdata/logs.go rename to model/pdata/logs.go diff --git a/consumer/pdata/logs_test.go b/model/pdata/logs_test.go similarity index 100% rename from consumer/pdata/logs_test.go rename to model/pdata/logs_test.go diff --git a/consumer/pdata/metrics.go b/model/pdata/metrics.go similarity index 100% rename from consumer/pdata/metrics.go rename to model/pdata/metrics.go diff --git a/consumer/pdata/metrics_test.go b/model/pdata/metrics_test.go similarity index 100% rename from consumer/pdata/metrics_test.go rename to model/pdata/metrics_test.go diff --git a/consumer/pdata/mocks_test.go b/model/pdata/mocks_test.go similarity index 100% rename from consumer/pdata/mocks_test.go rename to model/pdata/mocks_test.go diff --git a/consumer/pdata/spanid.go b/model/pdata/spanid.go similarity index 100% rename from consumer/pdata/spanid.go rename to model/pdata/spanid.go diff --git a/consumer/pdata/spanid_test.go b/model/pdata/spanid_test.go similarity index 100% rename from consumer/pdata/spanid_test.go rename to model/pdata/spanid_test.go diff --git a/consumer/pdata/timestamp.go b/model/pdata/timestamp.go similarity index 100% rename from consumer/pdata/timestamp.go rename to model/pdata/timestamp.go diff --git a/consumer/pdata/timestamp_test.go b/model/pdata/timestamp_test.go similarity index 100% rename from consumer/pdata/timestamp_test.go rename to model/pdata/timestamp_test.go diff --git a/consumer/pdata/traceid.go b/model/pdata/traceid.go similarity index 100% rename from consumer/pdata/traceid.go rename to model/pdata/traceid.go diff --git a/consumer/pdata/traceid_test.go b/model/pdata/traceid_test.go similarity index 100% rename from consumer/pdata/traceid_test.go rename to model/pdata/traceid_test.go diff --git a/consumer/pdata/traces.go b/model/pdata/traces.go similarity index 100% rename from consumer/pdata/traces.go rename to model/pdata/traces.go diff --git a/consumer/pdata/traces_test.go b/model/pdata/traces_test.go similarity index 100% rename from consumer/pdata/traces_test.go rename to model/pdata/traces_test.go diff --git a/processor/attributesprocessor/attributes_log.go b/processor/attributesprocessor/attributes_log.go index 83b5174ab0d..75a8cff6055 100644 --- a/processor/attributesprocessor/attributes_log.go +++ b/processor/attributesprocessor/attributes_log.go @@ -17,8 +17,8 @@ package attributesprocessor import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterlog" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/attributesprocessor/attributes_log_test.go b/processor/attributesprocessor/attributes_log_test.go index 483a7b5b20e..aef764c8bd5 100644 --- a/processor/attributesprocessor/attributes_log_test.go +++ b/processor/attributesprocessor/attributes_log_test.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/attributesprocessor/attributes_trace.go b/processor/attributesprocessor/attributes_trace.go index 06f246cf4a3..0c8695aec1e 100644 --- a/processor/attributesprocessor/attributes_trace.go +++ b/processor/attributesprocessor/attributes_trace.go @@ -17,8 +17,8 @@ package attributesprocessor import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterspan" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/attributesprocessor/attributes_trace_test.go b/processor/attributesprocessor/attributes_trace_test.go index 701331a9381..e0ab1e0562c 100644 --- a/processor/attributesprocessor/attributes_trace_test.go +++ b/processor/attributesprocessor/attributes_trace_test.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/processor/batchprocessor/batch_processor.go b/processor/batchprocessor/batch_processor.go index 32720ff186a..b2b76df3110 100644 --- a/processor/batchprocessor/batch_processor.go +++ b/processor/batchprocessor/batch_processor.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // batch_processor is a component that accepts spans and metrics, places them diff --git a/processor/batchprocessor/batch_processor_test.go b/processor/batchprocessor/batch_processor_test.go index ca268d18f0e..021f6e2c957 100644 --- a/processor/batchprocessor/batch_processor_test.go +++ b/processor/batchprocessor/batch_processor_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestBatchProcessorSpansDelivered(t *testing.T) { diff --git a/processor/batchprocessor/splitlogs.go b/processor/batchprocessor/splitlogs.go index e8e6169a120..26199f240ac 100644 --- a/processor/batchprocessor/splitlogs.go +++ b/processor/batchprocessor/splitlogs.go @@ -15,7 +15,7 @@ package batchprocessor import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // splitLogs removes logrecords from the input data and returns a new data of the specified size. diff --git a/processor/batchprocessor/splitlogs_test.go b/processor/batchprocessor/splitlogs_test.go index 44f55137525..c006e9a887a 100644 --- a/processor/batchprocessor/splitlogs_test.go +++ b/processor/batchprocessor/splitlogs_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestSplitLogs_noop(t *testing.T) { diff --git a/processor/batchprocessor/splitmetrics.go b/processor/batchprocessor/splitmetrics.go index 06afdc975d2..731021823c8 100644 --- a/processor/batchprocessor/splitmetrics.go +++ b/processor/batchprocessor/splitmetrics.go @@ -15,7 +15,7 @@ package batchprocessor import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // splitMetrics removes metrics from the input data and returns a new data of the specified size. diff --git a/processor/batchprocessor/splitmetrics_test.go b/processor/batchprocessor/splitmetrics_test.go index 8d8780ffa1d..5d54519cdc8 100644 --- a/processor/batchprocessor/splitmetrics_test.go +++ b/processor/batchprocessor/splitmetrics_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestSplitMetrics_noop(t *testing.T) { diff --git a/processor/batchprocessor/splittraces.go b/processor/batchprocessor/splittraces.go index 1e62a957fb2..46ff7f933ac 100644 --- a/processor/batchprocessor/splittraces.go +++ b/processor/batchprocessor/splittraces.go @@ -15,7 +15,7 @@ package batchprocessor import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // splitTraces removes spans from the input trace and returns a new trace of the specified size. diff --git a/processor/batchprocessor/splittraces_test.go b/processor/batchprocessor/splittraces_test.go index a3a19733723..0ff6cb5cbfd 100644 --- a/processor/batchprocessor/splittraces_test.go +++ b/processor/batchprocessor/splittraces_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestSplitTraces_noop(t *testing.T) { diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index 6bffec0c783..fbe24865d44 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -28,9 +28,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/processor/filtermetric" + "go.opentelemetry.io/collector/model/pdata" ) const filteredMetric = "p0_metric_1" diff --git a/processor/filterprocessor/filter_processor.go b/processor/filterprocessor/filter_processor.go index b94dfb5b0a9..9e4f7e4db82 100644 --- a/processor/filterprocessor/filter_processor.go +++ b/processor/filterprocessor/filter_processor.go @@ -19,11 +19,11 @@ import ( "go.uber.org/zap" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filtermatcher" "go.opentelemetry.io/collector/internal/processor/filtermetric" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/filterprocessor/filter_processor_test.go b/processor/filterprocessor/filter_processor_test.go index e53c9f20f49..74981c562f5 100644 --- a/processor/filterprocessor/filter_processor_test.go +++ b/processor/filterprocessor/filter_processor_test.go @@ -26,10 +26,10 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filtermetric" + "go.opentelemetry.io/collector/model/pdata" ) type metricNameTest struct { diff --git a/processor/memorylimiter/memorylimiter.go b/processor/memorylimiter/memorylimiter.go index 11430bbccea..81ed84f39cd 100644 --- a/processor/memorylimiter/memorylimiter.go +++ b/processor/memorylimiter/memorylimiter.go @@ -25,8 +25,8 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/config/configtelemetry" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/iruntime" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/processor/memorylimiter/memorylimiter_test.go b/processor/memorylimiter/memorylimiter_test.go index 50b7aebe130..04310fd22fa 100644 --- a/processor/memorylimiter/memorylimiter_test.go +++ b/processor/memorylimiter/memorylimiter_test.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/iruntime" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler.go b/processor/probabilisticsamplerprocessor/probabilisticsampler.go index 0dc96479678..995d56c9c36 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go index f83d7998091..be799bbdf93 100644 --- a/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go +++ b/processor/probabilisticsamplerprocessor/probabilisticsampler_test.go @@ -26,8 +26,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" idutils "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/processor/processorhelper/attraction.go b/processor/processorhelper/attraction.go index 502c39bd4a0..63afdbe741b 100644 --- a/processor/processorhelper/attraction.go +++ b/processor/processorhelper/attraction.go @@ -19,8 +19,8 @@ import ( "regexp" "strings" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterhelper" + "go.opentelemetry.io/collector/model/pdata" ) // Settings specifies the processor settings. diff --git a/processor/processorhelper/attraction_test.go b/processor/processorhelper/attraction_test.go index 50c181b7084..5e64943db4f 100644 --- a/processor/processorhelper/attraction_test.go +++ b/processor/processorhelper/attraction_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Common structure for all the Tests diff --git a/processor/processorhelper/hasher.go b/processor/processorhelper/hasher.go index 1ba53e1c500..87a634d43da 100644 --- a/processor/processorhelper/hasher.go +++ b/processor/processorhelper/hasher.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "math" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const ( diff --git a/processor/processorhelper/logs.go b/processor/processorhelper/logs.go index ad732f17eab..6858c92b047 100644 --- a/processor/processorhelper/logs.go +++ b/processor/processorhelper/logs.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // LProcessor is a helper interface that allows avoiding implementing all functions in LogsProcessor by using NewLogsProcessor. diff --git a/processor/processorhelper/logs_test.go b/processor/processorhelper/logs_test.go index 178daaca1bf..2de7de2097b 100644 --- a/processor/processorhelper/logs_test.go +++ b/processor/processorhelper/logs_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var testLogsCfg = config.NewProcessorSettings(config.NewID(typeStr)) diff --git a/processor/processorhelper/metrics.go b/processor/processorhelper/metrics.go index 84f186bb735..65456bfd18a 100644 --- a/processor/processorhelper/metrics.go +++ b/processor/processorhelper/metrics.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // MProcessor is a helper interface that allows avoiding implementing all functions in MetricsProcessor by using NewTracesProcessor. diff --git a/processor/processorhelper/metrics_test.go b/processor/processorhelper/metrics_test.go index 1775f6f7d0a..6d2a0fbb894 100644 --- a/processor/processorhelper/metrics_test.go +++ b/processor/processorhelper/metrics_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var testMetricsCfg = config.NewProcessorSettings(config.NewID(typeStr)) diff --git a/processor/processorhelper/traces.go b/processor/processorhelper/traces.go index 24703143599..9ac0817c6d0 100644 --- a/processor/processorhelper/traces.go +++ b/processor/processorhelper/traces.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumerhelper" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // TProcessor is a helper interface that allows avoiding implementing all functions in TracesProcessor by using NewTracesProcessor. diff --git a/processor/processorhelper/traces_test.go b/processor/processorhelper/traces_test.go index aef19c0c738..416b1e55c6b 100644 --- a/processor/processorhelper/traces_test.go +++ b/processor/processorhelper/traces_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var testTracesCfg = config.NewProcessorSettings(config.NewID(typeStr)) diff --git a/processor/resourceprocessor/resource_processor.go b/processor/resourceprocessor/resource_processor.go index 7b591525074..77465a528ee 100644 --- a/processor/resourceprocessor/resource_processor.go +++ b/processor/resourceprocessor/resource_processor.go @@ -17,7 +17,7 @@ package resourceprocessor import ( "context" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/resourceprocessor/resource_processor_test.go b/processor/resourceprocessor/resource_processor_test.go index fbdec28c783..3ee00791b18 100644 --- a/processor/resourceprocessor/resource_processor_test.go +++ b/processor/resourceprocessor/resource_processor_test.go @@ -24,8 +24,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/processorhelper" ) diff --git a/processor/spanprocessor/span.go b/processor/spanprocessor/span.go index a892d441775..0e0415007ec 100644 --- a/processor/spanprocessor/span.go +++ b/processor/spanprocessor/span.go @@ -21,8 +21,8 @@ import ( "strconv" "strings" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterspan" + "go.opentelemetry.io/collector/model/pdata" ) type spanProcessor struct { diff --git a/processor/spanprocessor/span_test.go b/processor/spanprocessor/span_test.go index 10c7a23dcbc..7285ca0567c 100644 --- a/processor/spanprocessor/span_test.go +++ b/processor/spanprocessor/span_test.go @@ -25,10 +25,10 @@ import ( "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterconfig" "go.opentelemetry.io/collector/internal/processor/filterset" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index 305f2d177e1..946a80b94de 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -31,7 +31,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/scraper/diskscraper" diff --git a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go index 0d8298ee11f..fe755d72f51 100644 --- a/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/metadata/generated_metrics.go @@ -18,7 +18,7 @@ package metadata import ( "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Type is the component type name. diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go index 8efd0ab126a..76aad66b183 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper.go @@ -22,7 +22,7 @@ import ( "github.com/shirou/gopsutil/host" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go index e8636fe3d28..ccf9ad14e58 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_linux.go @@ -19,7 +19,7 @@ package cpuscraper import ( "github.com/shirou/gopsutil/cpu" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go index 58280779c8b..74e867e9b7f 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_others.go @@ -19,7 +19,7 @@ package cpuscraper import ( "github.com/shirou/gopsutil/cpu" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go index 26e8c211eaa..8f19d7afeef 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/cpu_scraper_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go index 8a0e1fc1d6b..238bcfc7246 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others.go @@ -25,8 +25,8 @@ import ( "github.com/shirou/gopsutil/host" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_fallback.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_fallback.go index 2e1ae08d5bc..cc205edfe5a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_fallback.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_fallback.go @@ -19,7 +19,7 @@ package diskscraper import ( "github.com/shirou/gopsutil/disk" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const systemSpecificMetricsLen = 0 diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_linux.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_linux.go index 97dd5f0ae04..13ea9f9f14d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_others_linux.go @@ -19,7 +19,7 @@ package diskscraper import ( "github.com/shirou/gopsutil/disk" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go index 14d797daee6..5961111da65 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go index 0f68b3d6a29..949d69680f7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/disk_scraper_windows.go @@ -22,8 +22,8 @@ import ( "github.com/shirou/gopsutil/host" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/perfcounters" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go index c6aa8b385d0..cc72e311040 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper.go @@ -21,7 +21,7 @@ import ( "github.com/shirou/gopsutil/disk" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_others.go index 5d674434c22..ff4731b93a3 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_others.go @@ -17,7 +17,7 @@ package filesystemscraper import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go index 69f700dc1ef..40e7c48b525 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_unix.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_unix.go index 25cbd506e24..1082955c454 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_unix.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/filesystem_scraper_unix.go @@ -17,7 +17,7 @@ package filesystemscraper import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go index b86df6fa050..42cda0f3dc7 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper.go @@ -22,7 +22,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go index a459149410d..94ad2cb13fe 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_test.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go index 515715ec1f5..1562ac30e7b 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper.go @@ -20,7 +20,7 @@ import ( "github.com/shirou/gopsutil/mem" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_linux.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_linux.go index ce76541aa98..fe7442aae52 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_linux.go @@ -19,7 +19,7 @@ package memoryscraper import ( "github.com/shirou/gopsutil/mem" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_others.go index 1899721e6d8..40395e1ddfe 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_others.go @@ -19,7 +19,7 @@ package memoryscraper import ( "github.com/shirou/gopsutil/mem" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go index a7767a3b69b..e4367866f00 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_windows.go index 87e9ec32c5e..d53263ca2fa 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/memory_scraper_windows.go @@ -19,7 +19,7 @@ package memoryscraper import ( "github.com/shirou/gopsutil/mem" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go index 8ee6cbca901..145e0fe3986 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper.go @@ -23,8 +23,8 @@ import ( "github.com/shirou/gopsutil/net" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go index c1a7dd98a09..ade01102c38 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/network_scraper_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go index b121b535b36..f4df4f773e3 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_others.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/mem" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go index d7615c47194..2620f64fa2d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go index 545149a1506..c65bc518cae 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_windows.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/host" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/perfcounters" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go index a24f28c128a..bef1b1873cd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper.go @@ -21,7 +21,7 @@ import ( "github.com/shirou/gopsutil/load" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // scraper for Processes Metrics diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_darwin.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_darwin.go index 1f364d4556e..2499ae809ce 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_darwin.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_darwin.go @@ -19,7 +19,7 @@ package processesscraper import ( "github.com/shirou/gopsutil/load" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const unixSystemSpecificMetricsLen = 0 diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_fallback.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_fallback.go index 8808684aebc..7ee86d7ff73 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_fallback.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_fallback.go @@ -16,7 +16,7 @@ package processesscraper -import "go.opentelemetry.io/collector/consumer/pdata" +import "go.opentelemetry.io/collector/model/pdata" func appendSystemSpecificProcessesMetrics(metrics pdata.MetricSlice, startTime pdata.Timestamp, startIndex int, miscFunc getMiscStats) error { return nil diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go index c63c58bb8a5..597f23ef083 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_linux.go @@ -19,7 +19,7 @@ package processesscraper import ( "github.com/shirou/gopsutil/load" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go index 4b42445638b..345a00ca632 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go index 6803c4bb0fb..8cfb379e9f9 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/processes_scraper_unix.go @@ -21,7 +21,7 @@ import ( "github.com/shirou/gopsutil/load" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process.go index c49e0b00d97..0bbbae1d4cd 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process.go @@ -20,7 +20,7 @@ import ( "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/process" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go index 36742fcac4e..5a0c48cee25 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper.go @@ -24,8 +24,8 @@ import ( "github.com/shirou/gopsutil/process" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_linux.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_linux.go index 487721ef3a9..71c52b66004 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_linux.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_linux.go @@ -19,7 +19,7 @@ package processscraper import ( "github.com/shirou/gopsutil/cpu" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_others.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_others.go index 6318faf257e..868db703274 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_others.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_others.go @@ -19,7 +19,7 @@ package processscraper import ( "github.com/shirou/gopsutil/cpu" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const cpuStatesLen = 0 diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go index f53af7b3125..7df27fb1101 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/processor/filterset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" "go.opentelemetry.io/collector/receiver/scrapererror" diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_windows.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_windows.go index 08e31bf85c3..0b2b9945d2a 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_windows.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_windows.go @@ -22,7 +22,7 @@ import ( "github.com/shirou/gopsutil/cpu" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal/metadata" ) diff --git a/receiver/hostmetricsreceiver/internal/testutils.go b/receiver/hostmetricsreceiver/internal/testutils.go index 4fca1db9252..06793f9fdfc 100644 --- a/receiver/hostmetricsreceiver/internal/testutils.go +++ b/receiver/hostmetricsreceiver/internal/testutils.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func AssertContainsAttribute(t *testing.T, attr pdata.AttributeMap, key string) { diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index 142d39e0e79..3667e5a9d95 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -38,7 +38,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/conventions" "go.opentelemetry.io/collector/translator/trace/jaeger" diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 5acf13d3d2d..0c713992ee1 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -49,7 +49,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/conventions" diff --git a/receiver/kafkareceiver/factory_test.go b/receiver/kafkareceiver/factory_test.go index 431e60964ba..0c1ba86a704 100644 --- a/receiver/kafkareceiver/factory_test.go +++ b/receiver/kafkareceiver/factory_test.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/receiver/kafkareceiver/jaeger_unmarshaler.go b/receiver/kafkareceiver/jaeger_unmarshaler.go index 1a9c566a6a6..b593e560453 100644 --- a/receiver/kafkareceiver/jaeger_unmarshaler.go +++ b/receiver/kafkareceiver/jaeger_unmarshaler.go @@ -20,7 +20,7 @@ import ( "github.com/gogo/protobuf/jsonpb" jaegerproto "github.com/jaegertracing/jaeger/model" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger" ) diff --git a/receiver/kafkareceiver/jaeger_unmarshaler_test.go b/receiver/kafkareceiver/jaeger_unmarshaler_test.go index 9b46d9accf1..f64a627e275 100644 --- a/receiver/kafkareceiver/jaeger_unmarshaler_test.go +++ b/receiver/kafkareceiver/jaeger_unmarshaler_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" jaegertranslator "go.opentelemetry.io/collector/translator/trace/jaeger" ) diff --git a/receiver/kafkareceiver/kafka_receiver_test.go b/receiver/kafkareceiver/kafka_receiver_test.go index d5a813001ee..300b7a11a7f 100644 --- a/receiver/kafkareceiver/kafka_receiver_test.go +++ b/receiver/kafkareceiver/kafka_receiver_test.go @@ -32,10 +32,10 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/kafkaexporter" "go.opentelemetry.io/collector/internal/otlp" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/receiver/kafkareceiver/pdata_unmarshaler.go b/receiver/kafkareceiver/pdata_unmarshaler.go index 224933d4ba0..471b4e4defe 100644 --- a/receiver/kafkareceiver/pdata_unmarshaler.go +++ b/receiver/kafkareceiver/pdata_unmarshaler.go @@ -15,7 +15,7 @@ package kafkareceiver import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type pdataLogsUnmarshaler struct { diff --git a/receiver/kafkareceiver/unmarshaler.go b/receiver/kafkareceiver/unmarshaler.go index 5186026f99a..3b4ad45e113 100644 --- a/receiver/kafkareceiver/unmarshaler.go +++ b/receiver/kafkareceiver/unmarshaler.go @@ -15,8 +15,8 @@ package kafkareceiver import ( - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/otlp" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/trace/zipkinv1" "go.opentelemetry.io/collector/translator/trace/zipkinv2" ) diff --git a/receiver/kafkareceiver/zipkin_unmarshaler_test.go b/receiver/kafkareceiver/zipkin_unmarshaler_test.go index cb624929746..aeb3d4d6428 100644 --- a/receiver/kafkareceiver/zipkin_unmarshaler_test.go +++ b/receiver/kafkareceiver/zipkin_unmarshaler_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" "go.opentelemetry.io/collector/translator/trace/zipkinv2" ) diff --git a/receiver/opencensusreceiver/internal/octrace/opencensus.go b/receiver/opencensusreceiver/internal/octrace/opencensus.go index 214235aff65..040774e0c1e 100644 --- a/receiver/opencensusreceiver/internal/octrace/opencensus.go +++ b/receiver/opencensusreceiver/internal/octrace/opencensus.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/translator/internaldata" ) diff --git a/receiver/otlpreceiver/internal/logs/otlp.go b/receiver/otlpreceiver/internal/logs/otlp.go index f854b594caf..33d87ff653d 100644 --- a/receiver/otlpreceiver/internal/logs/otlp.go +++ b/receiver/otlpreceiver/internal/logs/otlp.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/receiver/otlpreceiver/internal/logs/otlp_test.go b/receiver/otlpreceiver/internal/logs/otlp_test.go index 7ad55aa0378..d0979320def 100644 --- a/receiver/otlpreceiver/internal/logs/otlp_test.go +++ b/receiver/otlpreceiver/internal/logs/otlp_test.go @@ -26,9 +26,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestExport(t *testing.T) { diff --git a/receiver/otlpreceiver/internal/metrics/otlp.go b/receiver/otlpreceiver/internal/metrics/otlp.go index 34c0f9ad9ce..78427a039af 100644 --- a/receiver/otlpreceiver/internal/metrics/otlp.go +++ b/receiver/otlpreceiver/internal/metrics/otlp.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/receiver/otlpreceiver/internal/metrics/otlp_test.go b/receiver/otlpreceiver/internal/metrics/otlp_test.go index 8675b3d4aa4..e3a6e40bd15 100644 --- a/receiver/otlpreceiver/internal/metrics/otlp_test.go +++ b/receiver/otlpreceiver/internal/metrics/otlp_test.go @@ -26,9 +26,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestExport(t *testing.T) { diff --git a/receiver/otlpreceiver/internal/trace/otlp.go b/receiver/otlpreceiver/internal/trace/otlp.go index 8ea9cdf1c25..9c015291336 100644 --- a/receiver/otlpreceiver/internal/trace/otlp.go +++ b/receiver/otlpreceiver/internal/trace/otlp.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/receiver/otlpreceiver/internal/trace/otlp_test.go b/receiver/otlpreceiver/internal/trace/otlp_test.go index 0e2d56fc721..0c455d43cc2 100644 --- a/receiver/otlpreceiver/internal/trace/otlp_test.go +++ b/receiver/otlpreceiver/internal/trace/otlp_test.go @@ -26,9 +26,9 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/pdatagrpc" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestExport(t *testing.T) { diff --git a/receiver/otlpreceiver/otlp_test.go b/receiver/otlpreceiver/otlp_test.go index 3fcb0a8bede..e8ec3aa2292 100644 --- a/receiver/otlpreceiver/otlp_test.go +++ b/receiver/otlpreceiver/otlp_test.go @@ -44,12 +44,12 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" 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/pdatagrpc" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/collector/testutil" "go.opentelemetry.io/collector/translator/conventions" diff --git a/receiver/otlpreceiver/otlphttp.go b/receiver/otlpreceiver/otlphttp.go index d194cc84a86..1bd211645bf 100644 --- a/receiver/otlpreceiver/otlphttp.go +++ b/receiver/otlpreceiver/otlphttp.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/logs" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/metrics" "go.opentelemetry.io/collector/receiver/otlpreceiver/internal/trace" diff --git a/receiver/prometheusreceiver/internal/otlp_metricfamily.go b/receiver/prometheusreceiver/internal/otlp_metricfamily.go index dd03a25f2cc..3b370b83b38 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricfamily.go +++ b/receiver/prometheusreceiver/internal/otlp_metricfamily.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/textparse" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type metricFamilyPdata struct { diff --git a/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go b/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go index ea1b2a2f87e..f096fa3e77f 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go +++ b/receiver/prometheusreceiver/internal/otlp_metricsbuilder.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/pkg/textparse" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func isUsefulLabelPdata(mType pdata.MetricDataType, labelKey string) bool { diff --git a/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go b/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go index 9853512c949..6e59c1eb5f1 100644 --- a/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go +++ b/receiver/prometheusreceiver/internal/otlp_metricsbuilder_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestGetBoundaryEquivalence(t *testing.T) { diff --git a/receiver/prometheusreceiver/internal/prom_to_otlp.go b/receiver/prometheusreceiver/internal/prom_to_otlp.go index 25d0bec79e3..9f8aa13cadf 100644 --- a/receiver/prometheusreceiver/internal/prom_to_otlp.go +++ b/receiver/prometheusreceiver/internal/prom_to_otlp.go @@ -17,7 +17,7 @@ package internal import ( "net" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/receiver/prometheusreceiver/internal/prom_to_otlp_test.go b/receiver/prometheusreceiver/internal/prom_to_otlp_test.go index a2de99c8243..8a8a421ed5c 100644 --- a/receiver/prometheusreceiver/internal/prom_to_otlp_test.go +++ b/receiver/prometheusreceiver/internal/prom_to_otlp_test.go @@ -20,7 +20,7 @@ import ( metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/internaldata" ) diff --git a/receiver/scraperhelper/scraper.go b/receiver/scraperhelper/scraper.go index c90ba350c82..03ec355a29c 100644 --- a/receiver/scraperhelper/scraper.go +++ b/receiver/scraperhelper/scraper.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenthelper" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" ) diff --git a/receiver/scraperhelper/scrapercontroller.go b/receiver/scraperhelper/scrapercontroller.go index a7aa9f0c848..cb03184a32b 100644 --- a/receiver/scraperhelper/scrapercontroller.go +++ b/receiver/scraperhelper/scrapercontroller.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/scraperhelper/scrapercontroller_test.go b/receiver/scraperhelper/scrapercontroller_test.go index 0f278d43031..156d8cc7b83 100644 --- a/receiver/scraperhelper/scrapercontroller_test.go +++ b/receiver/scraperhelper/scrapercontroller_test.go @@ -32,7 +32,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport/obsreporttest" "go.opentelemetry.io/collector/receiver/scrapererror" ) diff --git a/receiver/zipkinreceiver/proto_parse_test.go b/receiver/zipkinreceiver/proto_parse_test.go index be1ba99c251..bf7459c70ec 100644 --- a/receiver/zipkinreceiver/proto_parse_test.go +++ b/receiver/zipkinreceiver/proto_parse_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" "go.opentelemetry.io/collector/translator/trace/zipkinv2" diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index d99cdd82588..ac7b43391da 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -31,7 +31,7 @@ import ( "go.opentelemetry.io/collector/component/componenterror" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/obsreport" "go.opentelemetry.io/collector/translator/trace/zipkinv1" "go.opentelemetry.io/collector/translator/trace/zipkinv2" diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 7fa0deab96a..b9cb47273aa 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -43,8 +43,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/exporter/zipkinexporter" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/service/internal/builder/pipelines_builder_test.go b/service/internal/builder/pipelines_builder_test.go index d5690fa13d3..ed544d8ade7 100644 --- a/service/internal/builder/pipelines_builder_test.go +++ b/service/internal/builder/pipelines_builder_test.go @@ -28,9 +28,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testcomponents" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestBuildPipelines(t *testing.T) { diff --git a/service/internal/builder/receivers_builder_test.go b/service/internal/builder/receivers_builder_test.go index 28169e0bb9b..9c017703cc4 100644 --- a/service/internal/builder/receivers_builder_test.go +++ b/service/internal/builder/receivers_builder_test.go @@ -27,9 +27,9 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testcomponents" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/processor/attributesprocessor" ) diff --git a/service/internal/fanoutconsumer/cloningconsumer.go b/service/internal/fanoutconsumer/cloningconsumer.go index 14709c57af1..ad266c4dc33 100644 --- a/service/internal/fanoutconsumer/cloningconsumer.go +++ b/service/internal/fanoutconsumer/cloningconsumer.go @@ -19,7 +19,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewMetricsCloning wraps multiple metrics consumers in a single one and clones the data diff --git a/service/internal/fanoutconsumer/consumer.go b/service/internal/fanoutconsumer/consumer.go index ded5f4a1e0d..77c474298f0 100644 --- a/service/internal/fanoutconsumer/consumer.go +++ b/service/internal/fanoutconsumer/consumer.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // NewMetrics wraps multiple metrics consumers in a single one. diff --git a/testbed/correctness/metrics/metric_diff.go b/testbed/correctness/metrics/metric_diff.go index 1eb529312cf..5e5f1a797d0 100644 --- a/testbed/correctness/metrics/metric_diff.go +++ b/testbed/correctness/metrics/metric_diff.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // MetricDiff is intended to support producing human-readable diffs between two MetricData structs during diff --git a/testbed/correctness/metrics/metric_diff_test.go b/testbed/correctness/metrics/metric_diff_test.go index a5a68585db3..870ad9437f0 100644 --- a/testbed/correctness/metrics/metric_diff_test.go +++ b/testbed/correctness/metrics/metric_diff_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" + "go.opentelemetry.io/collector/model/pdata" ) func TestSameMetrics(t *testing.T) { diff --git a/testbed/correctness/metrics/metric_index.go b/testbed/correctness/metrics/metric_index.go index a07f9b39a14..091c8e47121 100644 --- a/testbed/correctness/metrics/metric_index.go +++ b/testbed/correctness/metrics/metric_index.go @@ -15,7 +15,7 @@ package metrics import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type metricReceived struct { diff --git a/testbed/correctness/metrics/metric_supplier.go b/testbed/correctness/metrics/metric_supplier.go index d1b01510e32..624a2a3b455 100644 --- a/testbed/correctness/metrics/metric_supplier.go +++ b/testbed/correctness/metrics/metric_supplier.go @@ -15,7 +15,7 @@ package metrics import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type metricSupplier struct { diff --git a/testbed/correctness/metrics/metrics_correctness_test.go b/testbed/correctness/metrics/metrics_correctness_test.go index 8729e5fd8a3..7528a512718 100644 --- a/testbed/correctness/metrics/metrics_correctness_test.go +++ b/testbed/correctness/metrics/metrics_correctness_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testbed/correctness" "go.opentelemetry.io/collector/testbed/testbed" ) diff --git a/testbed/correctness/metrics/metrics_test_harness.go b/testbed/correctness/metrics/metrics_test_harness.go index 71bbf971da5..5004bb19749 100644 --- a/testbed/correctness/metrics/metrics_test_harness.go +++ b/testbed/correctness/metrics/metrics_test_harness.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testbed/testbed" ) diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index aa37666c612..d2b793ae591 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -25,10 +25,10 @@ import ( "go.uber.org/atomic" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/idutils" "go.opentelemetry.io/collector/internal/otlp" + "go.opentelemetry.io/collector/model/pdata" ) // DataProvider defines the interface for generators of test data used to drive various end-to-end tests. diff --git a/testbed/testbed/data_providers_test.go b/testbed/testbed/data_providers_test.go index 4174e3dc820..aa7854d4a27 100644 --- a/testbed/testbed/data_providers_test.go +++ b/testbed/testbed/data_providers_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) const metricsPictPairsFile = "../../internal/goldendataset/testdata/generated_pict_pairs_metrics.txt" diff --git a/testbed/testbed/mock_backend.go b/testbed/testbed/mock_backend.go index 2b95ca80902..d854985c70d 100644 --- a/testbed/testbed/mock_backend.go +++ b/testbed/testbed/mock_backend.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // MockBackend is a backend that allows receiving the data locally. diff --git a/testbed/testbed/validator.go b/testbed/testbed/validator.go index 4927b8a0f9b..9093a434160 100644 --- a/testbed/testbed/validator.go +++ b/testbed/testbed/validator.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/testbed/tests/resource_processor_test.go b/testbed/tests/resource_processor_test.go index a82286c7565..c4c091b670d 100644 --- a/testbed/tests/resource_processor_test.go +++ b/testbed/tests/resource_processor_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testbed/testbed" ) diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index d581a379f61..b2b28de1d10 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/testbed/testbed" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/testutil/metricstestutil/metricsutil.go b/testutil/metricstestutil/metricsutil.go index 86dbc809a0e..5ffed29ecc7 100644 --- a/testutil/metricstestutil/metricsutil.go +++ b/testutil/metricstestutil/metricsutil.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Gauge creates a gauge metric. diff --git a/translator/internaldata/metrics_to_oc.go b/translator/internaldata/metrics_to_oc.go index e8fbbe4cdd9..f85d527263b 100644 --- a/translator/internaldata/metrics_to_oc.go +++ b/translator/internaldata/metrics_to_oc.go @@ -22,7 +22,7 @@ import ( ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "github.com/golang/protobuf/ptypes/wrappers" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) type labelKeys struct { diff --git a/translator/internaldata/metrics_to_oc_test.go b/translator/internaldata/metrics_to_oc_test.go index 0fd5706a02e..9a8a7f313e0 100644 --- a/translator/internaldata/metrics_to_oc_test.go +++ b/translator/internaldata/metrics_to_oc_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/translator/internaldata/oc_testdata_test.go b/translator/internaldata/oc_testdata_test.go index 98c09a85da1..3386d65dae9 100644 --- a/translator/internaldata/oc_testdata_test.go +++ b/translator/internaldata/oc_testdata_test.go @@ -24,9 +24,9 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/translator/internaldata/oc_to_metrics.go b/translator/internaldata/oc_to_metrics.go index 2f328672b84..793b0887743 100644 --- a/translator/internaldata/oc_to_metrics.go +++ b/translator/internaldata/oc_to_metrics.go @@ -19,7 +19,7 @@ import ( ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // OCToMetrics converts OC data format to data.MetricData. diff --git a/translator/internaldata/oc_to_metrics_test.go b/translator/internaldata/oc_to_metrics_test.go index 4312c7d458a..dbb1b3a6a91 100644 --- a/translator/internaldata/oc_to_metrics_test.go +++ b/translator/internaldata/oc_to_metrics_test.go @@ -23,8 +23,8 @@ import ( ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestOCToMetrics(t *testing.T) { diff --git a/translator/internaldata/oc_to_resource.go b/translator/internaldata/oc_to_resource.go index d98d508d784..96f814895dd 100644 --- a/translator/internaldata/oc_to_resource.go +++ b/translator/internaldata/oc_to_resource.go @@ -21,8 +21,8 @@ import ( ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" "go.opencensus.io/resource/resourcekeys" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/translator/internaldata/oc_to_resource_test.go b/translator/internaldata/oc_to_resource_test.go index e4fcd948e10..06b1e1edc65 100644 --- a/translator/internaldata/oc_to_resource_test.go +++ b/translator/internaldata/oc_to_resource_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/proto" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" ) func TestOcNodeResourceToInternal(t *testing.T) { diff --git a/translator/internaldata/oc_to_traces.go b/translator/internaldata/oc_to_traces.go index 760fc6ab93d..e73ee41b75b 100644 --- a/translator/internaldata/oc_to_traces.go +++ b/translator/internaldata/oc_to_traces.go @@ -23,8 +23,8 @@ import ( "go.opencensus.io/trace" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/internaldata/oc_to_traces_test.go b/translator/internaldata/oc_to_traces_test.go index 6d18f0c3d33..e7f7f1d164a 100644 --- a/translator/internaldata/oc_to_traces_test.go +++ b/translator/internaldata/oc_to_traces_test.go @@ -26,10 +26,10 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1" "go.opentelemetry.io/collector/internal/occonventions" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestOcTraceStateToInternal(t *testing.T) { diff --git a/translator/internaldata/resource_to_oc.go b/translator/internaldata/resource_to_oc.go index 91d1f9394dc..aa5ac5b7b7a 100644 --- a/translator/internaldata/resource_to_oc.go +++ b/translator/internaldata/resource_to_oc.go @@ -23,8 +23,8 @@ import ( "go.opencensus.io/resource/resourcekeys" "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/internaldata/resource_to_oc_test.go b/translator/internaldata/resource_to_oc_test.go index 113572749cb..c47021c848a 100644 --- a/translator/internaldata/resource_to_oc_test.go +++ b/translator/internaldata/resource_to_oc_test.go @@ -27,9 +27,9 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/testing/protocmp" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" ) diff --git a/translator/internaldata/timestamp.go b/translator/internaldata/timestamp.go index f2a221fe2ba..48dc8325f0f 100644 --- a/translator/internaldata/timestamp.go +++ b/translator/internaldata/timestamp.go @@ -17,7 +17,7 @@ package internaldata import ( "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // timestampAsTimestampPb converts a pdata.Timestamp to a protobuf known type Timestamp. diff --git a/translator/internaldata/traces_to_oc.go b/translator/internaldata/traces_to_oc.go index ed4acb77feb..846bb6c6d13 100644 --- a/translator/internaldata/traces_to_oc.go +++ b/translator/internaldata/traces_to_oc.go @@ -24,8 +24,8 @@ import ( "go.opencensus.io/trace" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/internaldata/traces_to_oc_test.go b/translator/internaldata/traces_to_oc_test.go index 24154b299f2..3f62471948a 100644 --- a/translator/internaldata/traces_to_oc_test.go +++ b/translator/internaldata/traces_to_oc_test.go @@ -25,10 +25,10 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/occonventions" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/internal/zipkin/attributes.go b/translator/trace/internal/zipkin/attributes.go index cbd9d0aa220..9269d866ab8 100644 --- a/translator/trace/internal/zipkin/attributes.go +++ b/translator/trace/internal/zipkin/attributes.go @@ -17,7 +17,7 @@ package zipkin import ( "regexp" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // These constants are the attribute keys used when translating from zipkin diff --git a/translator/trace/jaeger/jaegerproto_to_traces.go b/translator/trace/jaeger/jaegerproto_to_traces.go index 1a465347443..caf34c2246a 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces.go +++ b/translator/trace/jaeger/jaegerproto_to_traces.go @@ -24,9 +24,9 @@ import ( "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - "go.opentelemetry.io/collector/consumer/pdata" idutils "go.opentelemetry.io/collector/internal/idutils" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/jaeger/jaegerproto_to_traces_test.go b/translator/trace/jaeger/jaegerproto_to_traces_test.go index 01f8e328a7d..299e099af28 100644 --- a/translator/trace/jaeger/jaegerproto_to_traces_test.go +++ b/translator/trace/jaeger/jaegerproto_to_traces_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/idutils" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/jaeger/jaegerthrift_to_traces.go b/translator/trace/jaeger/jaegerthrift_to_traces.go index 2367541ba6c..433247bdacc 100644 --- a/translator/trace/jaeger/jaegerthrift_to_traces.go +++ b/translator/trace/jaeger/jaegerthrift_to_traces.go @@ -21,8 +21,8 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - "go.opentelemetry.io/collector/consumer/pdata" idutils "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/jaeger/jaegerthrift_to_traces_test.go b/translator/trace/jaeger/jaegerthrift_to_traces_test.go index 5bacdd27f97..d3087966a3e 100644 --- a/translator/trace/jaeger/jaegerthrift_to_traces_test.go +++ b/translator/trace/jaeger/jaegerthrift_to_traces_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/jaeger/traces_to_jaegerproto.go b/translator/trace/jaeger/traces_to_jaegerproto.go index 11350e106ef..cc8ec2d1815 100644 --- a/translator/trace/jaeger/traces_to_jaegerproto.go +++ b/translator/trace/jaeger/traces_to_jaegerproto.go @@ -19,8 +19,8 @@ import ( "github.com/jaegertracing/jaeger/model" - "go.opentelemetry.io/collector/consumer/pdata" idutils "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/jaeger/traces_to_jaegerproto_test.go b/translator/trace/jaeger/traces_to_jaegerproto_test.go index b74f33123cc..a0c658b2bf9 100644 --- a/translator/trace/jaeger/traces_to_jaegerproto_test.go +++ b/translator/trace/jaeger/traces_to_jaegerproto_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" ) diff --git a/translator/trace/protospan_translation.go b/translator/trace/protospan_translation.go index 3dcb6cdac3c..9d88fe7502b 100644 --- a/translator/trace/protospan_translation.go +++ b/translator/trace/protospan_translation.go @@ -19,7 +19,7 @@ import ( "fmt" "strconv" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) // Some of the keys used to represent OTLP constructs as tags or annotations in other formats. diff --git a/translator/trace/protospan_translation_test.go b/translator/trace/protospan_translation_test.go index ed95257d928..9823b318e27 100644 --- a/translator/trace/protospan_translation_test.go +++ b/translator/trace/protospan_translation_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestAttributeValueToString(t *testing.T) { diff --git a/translator/trace/zipkinv1/json.go b/translator/trace/zipkinv1/json.go index 7a81eb7c616..86562cca43c 100644 --- a/translator/trace/zipkinv1/json.go +++ b/translator/trace/zipkinv1/json.go @@ -27,8 +27,8 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" tracetranslator "go.opentelemetry.io/collector/translator/trace" "go.opentelemetry.io/collector/translator/trace/internal/zipkin" ) diff --git a/translator/trace/zipkinv1/thrift.go b/translator/trace/zipkinv1/thrift.go index 691a7657601..6307160dd31 100644 --- a/translator/trace/zipkinv1/thrift.go +++ b/translator/trace/zipkinv1/thrift.go @@ -28,8 +28,8 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "google.golang.org/protobuf/types/known/timestamppb" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" ) var _ pdata.TracesDecoder = (*thriftDecoder)(nil) diff --git a/translator/trace/zipkinv1/to_translator.go b/translator/trace/zipkinv1/to_translator.go index 0b1a7e3a7d7..189a46855ad 100644 --- a/translator/trace/zipkinv1/to_translator.go +++ b/translator/trace/zipkinv1/to_translator.go @@ -15,7 +15,7 @@ package zipkinv1 import ( - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/internaldata" ) diff --git a/translator/trace/zipkinv2/from_translator.go b/translator/trace/zipkinv2/from_translator.go index dad08389d0b..e12519f528f 100644 --- a/translator/trace/zipkinv2/from_translator.go +++ b/translator/trace/zipkinv2/from_translator.go @@ -24,8 +24,8 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/idutils" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" "go.opentelemetry.io/collector/translator/trace/internal/zipkin" diff --git a/translator/trace/zipkinv2/from_translator_test.go b/translator/trace/zipkinv2/from_translator_test.go index 6ab1c99b9ac..514b9a4dfc4 100644 --- a/translator/trace/zipkinv2/from_translator_test.go +++ b/translator/trace/zipkinv2/from_translator_test.go @@ -21,9 +21,9 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/goldendataset" "go.opentelemetry.io/collector/internal/testdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestInternalTracesToZipkinSpans(t *testing.T) { diff --git a/translator/trace/zipkinv2/json.go b/translator/trace/zipkinv2/json.go index c9b5a774da6..b480a836158 100644 --- a/translator/trace/zipkinv2/json.go +++ b/translator/trace/zipkinv2/json.go @@ -20,7 +20,7 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinreporter "github.com/openzipkin/zipkin-go/reporter" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var _ pdata.TracesDecoder = (*jsonDecoder)(nil) diff --git a/translator/trace/zipkinv2/json_test.go b/translator/trace/zipkinv2/json_test.go index 0b104b1bbdb..e0ffafc6096 100644 --- a/translator/trace/zipkinv2/json_test.go +++ b/translator/trace/zipkinv2/json_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestJSONDecoder_DecodeTraces(t *testing.T) { diff --git a/translator/trace/zipkinv2/protobuf.go b/translator/trace/zipkinv2/protobuf.go index 8e7ffba6111..558b57c6388 100644 --- a/translator/trace/zipkinv2/protobuf.go +++ b/translator/trace/zipkinv2/protobuf.go @@ -18,7 +18,7 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" "github.com/openzipkin/zipkin-go/proto/zipkin_proto3" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) var _ pdata.TracesDecoder = (*protobufDecoder)(nil) diff --git a/translator/trace/zipkinv2/protobuf_test.go b/translator/trace/zipkinv2/protobuf_test.go index f0a8be4303b..d9b5764df3d 100644 --- a/translator/trace/zipkinv2/protobuf_test.go +++ b/translator/trace/zipkinv2/protobuf_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" ) func TestProtobufDecoder_DecodeTraces(t *testing.T) { diff --git a/translator/trace/zipkinv2/to_translator.go b/translator/trace/zipkinv2/to_translator.go index 05bf2db5d4f..7af4dfdb178 100644 --- a/translator/trace/zipkinv2/to_translator.go +++ b/translator/trace/zipkinv2/to_translator.go @@ -25,11 +25,11 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" - "go.opentelemetry.io/collector/consumer/pdata" "go.opentelemetry.io/collector/internal/data" otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1" "go.opentelemetry.io/collector/internal/idutils" "go.opentelemetry.io/collector/internal/occonventions" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" tracetranslator "go.opentelemetry.io/collector/translator/trace" "go.opentelemetry.io/collector/translator/trace/internal/zipkin" diff --git a/translator/trace/zipkinv2/to_translator_test.go b/translator/trace/zipkinv2/to_translator_test.go index 431336e5baa..6d335994225 100644 --- a/translator/trace/zipkinv2/to_translator_test.go +++ b/translator/trace/zipkinv2/to_translator_test.go @@ -21,7 +21,7 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/model/pdata" "go.opentelemetry.io/collector/translator/conventions" "go.opentelemetry.io/collector/translator/trace/internal/zipkin" )