Skip to content

Commit

Permalink
Move pdata in the new package
Browse files Browse the repository at this point in the history
The new module go.opentelemetry.io/collector/model will be created later when the internal data will
also be moved.

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu committed Jun 23, 2021
1 parent 8786546 commit b9c4276
Show file tree
Hide file tree
Showing 289 changed files with 262 additions and 262 deletions.
2 changes: 1 addition & 1 deletion cmd/mdatagen/metrics.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/pdatagen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion component/componenttest/nop_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion component/componenttest/nop_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion config/configgrpc/configgrpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumererror/signalerrors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumerhelper/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/err.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package consumertest
import (
"context"

"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/model/pdata"
)

type errConsumer struct {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/err_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/nop.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package consumertest
import (
"context"

"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/model/pdata"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/nop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/sink.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumertest/sink_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion consumer/simple/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion consumer/simple/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/resource_to_label.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/traces.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/fileexporter/file_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion exporter/jaegerexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/jaegerexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/jaeger_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/jaeger_marshaler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/kafka_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/kafka_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/pdata_marshaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package kafkaexporter
import (
"github.com/Shopify/sarama"

"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/model/pdata"
)

type pdataLogsMarshaler struct {
Expand Down
2 changes: 1 addition & 1 deletion exporter/loggingexporter/logging_exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit b9c4276

Please sign in to comment.