Move internal/pdatagrpc to model/otlpgrpc

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

Author: bogdandrutu

config/configgrpc/configgrpc_test.go

@@ -32,7 +32,7 @@ import (
 	"go.opentelemetry.io/collector/config/configauth"
 	"go.opentelemetry.io/collector/config/confignet"
 	"go.opentelemetry.io/collector/config/configtls"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -453,7 +453,7 @@ func TestHttpReception(t *testing.T) {
 			opts, err := gss.ToServerOption(map[config.ComponentID]component.Extension{})
 			assert.NoError(t, err)
 			s := grpc.NewServer(opts...)
-			pdatagrpc.RegisterTracesServer(s, &grpcTraceServer{})
+			pdatagrpc2.RegisterTracesServer(s, &grpcTraceServer{})
 
 			go func() {
 				_ = s.Serve(ln)
@@ -467,7 +467,7 @@ func TestHttpReception(t *testing.T) {
 			assert.NoError(t, errClient)
 			grpcClientConn, errDial := grpc.Dial(gcs.Endpoint, clientOpts...)
 			assert.NoError(t, errDial)
-			client := pdatagrpc.NewTracesClient(grpcClientConn)
+			client := pdatagrpc2.NewTracesClient(grpcClientConn)
 			ctx, cancelFunc := context.WithTimeout(context.Background(), 2*time.Second)
 			resp, errResp := client.Export(ctx, pdata.NewTraces(), grpc.WaitForReady(true))
 			if tt.hasError {
@@ -498,7 +498,7 @@ func TestReceiveOnUnixDomainSocket(t *testing.T) {
 	opts, err := gss.ToServerOption(map[config.ComponentID]component.Extension{})
 	assert.NoError(t, err)
 	s := grpc.NewServer(opts...)
-	pdatagrpc.RegisterTracesServer(s, &grpcTraceServer{})
+	pdatagrpc2.RegisterTracesServer(s, &grpcTraceServer{})
 
 	go func() {
 		_ = s.Serve(ln)
@@ -514,7 +514,7 @@ func TestReceiveOnUnixDomainSocket(t *testing.T) {
 	assert.NoError(t, errClient)
 	grpcClientConn, errDial := grpc.Dial(gcs.Endpoint, clientOpts...)
 	assert.NoError(t, errDial)
-	client := pdatagrpc.NewTracesClient(grpcClientConn)
+	client := pdatagrpc2.NewTracesClient(grpcClientConn)
 	ctx, cancelFunc := context.WithTimeout(context.Background(), 2*time.Second)
 	resp, errResp := client.Export(ctx, pdata.NewTraces(), grpc.WaitForReady(true))
 	assert.NoError(t, errResp)
@@ -525,8 +525,8 @@ func TestReceiveOnUnixDomainSocket(t *testing.T) {
 
 type grpcTraceServer struct{}
 
-func (gts *grpcTraceServer) Export(context.Context, pdata.Traces) (pdatagrpc.TracesResponse, error) {
-	return pdatagrpc.NewTracesResponse(), nil
+func (gts *grpcTraceServer) Export(context.Context, pdata.Traces) (pdatagrpc2.TracesResponse, error) {
+	return pdatagrpc2.NewTracesResponse(), nil
 }
 
 // tempSocketName provides a temporary Unix socket name for testing.

exporter/otlpexporter/otlp.go

@@ -30,7 +30,7 @@ import (
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -86,9 +86,9 @@ func (e *exporter) pushLogs(ctx context.Context, ld pdata.Logs) error {
 
 type grpcSender struct {
 	// gRPC clients and connection.
-	traceExporter  pdatagrpc.TracesClient
-	metricExporter pdatagrpc.MetricsClient
-	logExporter    pdatagrpc.LogsClient
+	traceExporter  pdatagrpc2.TracesClient
+	metricExporter pdatagrpc2.MetricsClient
+	logExporter    pdatagrpc2.LogsClient
 	clientConn     *grpc.ClientConn
 	metadata       metadata.MD
 	callOptions    []grpc.CallOption
@@ -106,9 +106,9 @@ func newGrpcSender(config *Config, ext map[config.ComponentID]component.Extensio
 	}
 
 	gs := &grpcSender{
-		traceExporter:  pdatagrpc.NewTracesClient(clientConn),
-		metricExporter: pdatagrpc.NewMetricsClient(clientConn),
-		logExporter:    pdatagrpc.NewLogsClient(clientConn),
+		traceExporter:  pdatagrpc2.NewTracesClient(clientConn),
+		metricExporter: pdatagrpc2.NewMetricsClient(clientConn),
+		logExporter:    pdatagrpc2.NewLogsClient(clientConn),
 		clientConn:     clientConn,
 		metadata:       metadata.New(config.GRPCClientSettings.Headers),
 		callOptions: []grpc.CallOption{

exporter/otlpexporter/otlp_test.go

@@ -31,8 +31,8 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configtls"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
 	"go.opentelemetry.io/collector/internal/testdata"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -55,14 +55,14 @@ type mockTracesReceiver struct {
 	lastRequest pdata.Traces
 }
 
-func (r *mockTracesReceiver) Export(ctx context.Context, td pdata.Traces) (pdatagrpc.TracesResponse, error) {
+func (r *mockTracesReceiver) Export(ctx context.Context, td pdata.Traces) (pdatagrpc2.TracesResponse, error) {
 	atomic.AddInt32(&r.requestCount, 1)
 	atomic.AddInt32(&r.totalItems, int32(td.SpanCount()))
 	r.mux.Lock()
 	defer r.mux.Unlock()
 	r.lastRequest = td
 	r.metadata, _ = metadata.FromIncomingContext(ctx)
-	return pdatagrpc.NewTracesResponse(), nil
+	return pdatagrpc2.NewTracesResponse(), nil
 }
 
 func (r *mockTracesReceiver) GetLastRequest() pdata.Traces {
@@ -79,7 +79,7 @@ func otlpTracesReceiverOnGRPCServer(ln net.Listener) *mockTracesReceiver {
 	}
 
 	// Now run it as a gRPC server
-	pdatagrpc.RegisterTracesServer(rcv.srv, rcv)
+	pdatagrpc2.RegisterTracesServer(rcv.srv, rcv)
 	go func() {
 		_ = rcv.srv.Serve(ln)
 	}()
@@ -92,14 +92,14 @@ type mockLogsReceiver struct {
 	lastRequest pdata.Logs
 }
 
-func (r *mockLogsReceiver) Export(ctx context.Context, ld pdata.Logs) (pdatagrpc.LogsResponse, error) {
+func (r *mockLogsReceiver) Export(ctx context.Context, ld pdata.Logs) (pdatagrpc2.LogsResponse, error) {
 	atomic.AddInt32(&r.requestCount, 1)
 	atomic.AddInt32(&r.totalItems, int32(ld.LogRecordCount()))
 	r.mux.Lock()
 	defer r.mux.Unlock()
 	r.lastRequest = ld
 	r.metadata, _ = metadata.FromIncomingContext(ctx)
-	return pdatagrpc.NewLogsResponse(), nil
+	return pdatagrpc2.NewLogsResponse(), nil
 }
 
 func (r *mockLogsReceiver) GetLastRequest() pdata.Logs {
@@ -116,7 +116,7 @@ func otlpLogsReceiverOnGRPCServer(ln net.Listener) *mockLogsReceiver {
 	}
 
 	// Now run it as a gRPC server
-	pdatagrpc.RegisterLogsServer(rcv.srv, rcv)
+	pdatagrpc2.RegisterLogsServer(rcv.srv, rcv)
 	go func() {
 		_ = rcv.srv.Serve(ln)
 	}()
@@ -129,15 +129,15 @@ type mockMetricsReceiver struct {
 	lastRequest pdata.Metrics
 }
 
-func (r *mockMetricsReceiver) Export(ctx context.Context, md pdata.Metrics) (pdatagrpc.MetricsResponse, error) {
+func (r *mockMetricsReceiver) Export(ctx context.Context, md pdata.Metrics) (pdatagrpc2.MetricsResponse, error) {
 	atomic.AddInt32(&r.requestCount, 1)
 	_, recordCount := md.MetricAndDataPointCount()
 	atomic.AddInt32(&r.totalItems, int32(recordCount))
 	r.mux.Lock()
 	defer r.mux.Unlock()
 	r.lastRequest = md
 	r.metadata, _ = metadata.FromIncomingContext(ctx)
-	return pdatagrpc.NewMetricsResponse(), nil
+	return pdatagrpc2.NewMetricsResponse(), nil
 }
 
 func (r *mockMetricsReceiver) GetLastRequest() pdata.Metrics {
@@ -154,7 +154,7 @@ func otlpMetricsReceiverOnGRPCServer(ln net.Listener) *mockMetricsReceiver {
 	}
 
 	// Now run it as a gRPC server
-	pdatagrpc.RegisterMetricsServer(rcv.srv, rcv)
+	pdatagrpc2.RegisterMetricsServer(rcv.srv, rcv)
 	go func() {
 		_ = rcv.srv.Serve(ln)
 	}()

internal/pdatagrpc/logs.go model/otlpgrpc/logs.gointernal/pdatagrpc/logs.go renamed to model/otlpgrpc/logs.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdatagrpc
+package otlpgrpc
 
 import (
 	"context"

internal/pdatagrpc/metrics.go model/otlpgrpc/metrics.gointernal/pdatagrpc/metrics.go renamed to model/otlpgrpc/metrics.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdatagrpc
+package otlpgrpc
 
 import (
 	"context"

internal/pdatagrpc/traces.go model/otlpgrpc/traces.gointernal/pdatagrpc/traces.go renamed to model/otlpgrpc/traces.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdatagrpc
+package otlpgrpc
 
 import (
 	"context"

receiver/otlpreceiver/internal/logs/otlp.go

@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/client"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 	"go.opentelemetry.io/collector/obsreport"
 )
@@ -54,15 +54,15 @@ const (
 var receiverID = config.NewIDWithName("otlp", "log")
 
 // Export implements the service Export logs func.
-func (r *Receiver) Export(ctx context.Context, ld pdata.Logs) (pdatagrpc.LogsResponse, error) {
+func (r *Receiver) Export(ctx context.Context, ld pdata.Logs) (pdatagrpc2.LogsResponse, error) {
 	// We need to ensure that it propagates the receiver name as a tag
 	ctxWithReceiverName := obsreport.ReceiverContext(ctx, r.id, receiverTransport)
 	err := r.sendToNextConsumer(ctxWithReceiverName, ld)
 	if err != nil {
-		return pdatagrpc.LogsResponse{}, err
+		return pdatagrpc2.LogsResponse{}, err
 	}
 
-	return pdatagrpc.NewLogsResponse(), nil
+	return pdatagrpc2.NewLogsResponse(), nil
 }
 
 func (r *Receiver) sendToNextConsumer(ctx context.Context, ld pdata.Logs) error {

receiver/otlpreceiver/internal/logs/otlp_test.go

@@ -26,8 +26,8 @@ import (
 
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
 	"go.opentelemetry.io/collector/internal/testdata"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -84,16 +84,16 @@ func TestExport_ErrorConsumer(t *testing.T) {
 
 	resp, err := logClient.Export(context.Background(), req)
 	assert.EqualError(t, err, "rpc error: code = Unknown desc = my error")
-	assert.Equal(t, pdatagrpc.LogsResponse{}, resp)
+	assert.Equal(t, pdatagrpc2.LogsResponse{}, resp)
 }
 
-func makeLogsServiceClient(addr net.Addr) (pdatagrpc.LogsClient, func(), error) {
+func makeLogsServiceClient(addr net.Addr) (pdatagrpc2.LogsClient, func(), error) {
 	cc, err := grpc.Dial(addr.String(), grpc.WithInsecure(), grpc.WithBlock())
 	if err != nil {
 		return nil, nil, err
 	}
 
-	logClient := pdatagrpc.NewLogsClient(cc)
+	logClient := pdatagrpc2.NewLogsClient(cc)
 
 	doneFn := func() { _ = cc.Close() }
 	return logClient, doneFn, nil
@@ -115,7 +115,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, tc consumer.Logs) (net.Addr, func())
 
 	// Now run it as a gRPC server
 	srv := grpc.NewServer()
-	pdatagrpc.RegisterLogsServer(srv, r)
+	pdatagrpc2.RegisterLogsServer(srv, r)
 	go func() {
 		_ = srv.Serve(ln)
 	}()

receiver/otlpreceiver/internal/metrics/otlp.go

@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/client"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 	"go.opentelemetry.io/collector/obsreport"
 )
@@ -53,14 +53,14 @@ const (
 var receiverID = config.NewIDWithName("otlp", "metrics")
 
 // Export implements the service Export metrics func.
-func (r *Receiver) Export(ctx context.Context, md pdata.Metrics) (pdatagrpc.MetricsResponse, error) {
+func (r *Receiver) Export(ctx context.Context, md pdata.Metrics) (pdatagrpc2.MetricsResponse, error) {
 	receiverCtx := obsreport.ReceiverContext(ctx, r.id, receiverTransport)
 	err := r.sendToNextConsumer(receiverCtx, md)
 	if err != nil {
-		return pdatagrpc.MetricsResponse{}, err
+		return pdatagrpc2.MetricsResponse{}, err
 	}
 
-	return pdatagrpc.NewMetricsResponse(), nil
+	return pdatagrpc2.NewMetricsResponse(), nil
 }
 
 func (r *Receiver) sendToNextConsumer(ctx context.Context, md pdata.Metrics) error {

receiver/otlpreceiver/internal/metrics/otlp_test.go

@@ -26,8 +26,8 @@ import (
 
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumertest"
-	"go.opentelemetry.io/collector/internal/pdatagrpc"
 	"go.opentelemetry.io/collector/internal/testdata"
+	pdatagrpc2 "go.opentelemetry.io/collector/model/otlpgrpc"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 
@@ -93,16 +93,16 @@ func TestExport_ErrorConsumer(t *testing.T) {
 
 	resp, err := metricsClient.Export(context.Background(), req)
 	assert.EqualError(t, err, "rpc error: code = Unknown desc = my error")
-	assert.Equal(t, pdatagrpc.MetricsResponse{}, resp)
+	assert.Equal(t, pdatagrpc2.MetricsResponse{}, resp)
 }
 
-func makeMetricsServiceClient(addr net.Addr) (pdatagrpc.MetricsClient, func(), error) {
+func makeMetricsServiceClient(addr net.Addr) (pdatagrpc2.MetricsClient, func(), error) {
 	cc, err := grpc.Dial(addr.String(), grpc.WithInsecure(), grpc.WithBlock())
 	if err != nil {
 		return nil, nil, err
 	}
 
-	metricsClient := pdatagrpc.NewMetricsClient(cc)
+	metricsClient := pdatagrpc2.NewMetricsClient(cc)
 
 	doneFn := func() { _ = cc.Close() }
 	return metricsClient, doneFn, nil
@@ -122,7 +122,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, mc consumer.Metrics) (net.Addr, func
 	r := New(receiverID, mc)
 	// Now run it as a gRPC server
 	srv := grpc.NewServer()
-	pdatagrpc.RegisterMetricsServer(srv, r)
+	pdatagrpc2.RegisterMetricsServer(srv, r)
 	go func() {
 		_ = srv.Serve(ln)
 	}()