Move internal data wrappers to model/internal (#3514)

Signed-off-by: Bogdan Drutu <[email protected]>
open-telemetry · Jun 29, 2021 · 3acff6c · 3acff6c
1 parent 590f240
commit 3acff6c
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 13 deletions.
diff --git a/internal/otlp_wrapper.go → model/internal/otlp_wrapper.go b/internal/otlp_wrapper.go → model/internal/otlp_wrapper.go
diff --git a/internal/otlp_wrappers_test.go → model/internal/otlp_wrappers_test.go b/internal/otlp_wrappers_test.go → model/internal/otlp_wrappers_test.go
diff --git a/model/otlp/json_marshaler.go b/model/otlp/json_marshaler.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 
-	"go.opentelemetry.io/collector/internal"
+	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlp/json_unmarshaler.go b/model/otlp/json_unmarshaler.go
@@ -19,10 +19,10 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 
-	"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/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlp/pb_marshaler.go b/model/otlp/pb_marshaler.go
@@ -15,7 +15,7 @@
 package otlp
 
 import (
-	"go.opentelemetry.io/collector/internal"
+	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlp/pb_unmarshaler.go b/model/otlp/pb_unmarshaler.go
@@ -15,10 +15,10 @@
 package otlp
 
 import (
-	"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/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlpgrpc/logs.go b/model/otlpgrpc/logs.go
@@ -19,8 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectorlogs "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1"
+	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlpgrpc/metrics.go b/model/otlpgrpc/metrics.go
@@ -19,8 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
+	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlpgrpc/traces.go b/model/otlpgrpc/traces.go
@@ -19,8 +19,8 @@ import (
 
 	"google.golang.org/grpc"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectortraces "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
+	"go.opentelemetry.io/collector/model/internal"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/pdata/logs.go b/model/pdata/logs.go
@@ -15,9 +15,9 @@
 package pdata
 
 import (
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectorlog "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1"
 	otlplogs "go.opentelemetry.io/collector/internal/data/protogen/logs/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 // LogsMarshaler marshals pdata.Logs into bytes.

diff --git a/model/pdata/logs_test.go b/model/pdata/logs_test.go
@@ -20,9 +20,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectorlog "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1"
 	otlplogs "go.opentelemetry.io/collector/internal/data/protogen/logs/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 func TestLogRecordCount(t *testing.T) {

diff --git a/model/pdata/metrics.go b/model/pdata/metrics.go
@@ -15,9 +15,9 @@
 package pdata
 
 import (
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
 	otlpmetrics "go.opentelemetry.io/collector/internal/data/protogen/metrics/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 // MetricsMarshaler marshals pdata.Metrics into bytes.

diff --git a/model/pdata/metrics_test.go b/model/pdata/metrics_test.go
@@ -23,11 +23,11 @@ import (
 	goproto "google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
 	otlpcommon "go.opentelemetry.io/collector/internal/data/protogen/common/v1"
 	otlpmetrics "go.opentelemetry.io/collector/internal/data/protogen/metrics/v1"
 	otlpresource "go.opentelemetry.io/collector/internal/data/protogen/resource/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 const (

diff --git a/model/pdata/traces.go b/model/pdata/traces.go
@@ -15,9 +15,9 @@
 package pdata
 
 import (
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
 	otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 // TracesMarshaler marshals pdata.Traces into bytes.

diff --git a/model/pdata/traces_test.go b/model/pdata/traces_test.go
@@ -23,9 +23,9 @@ import (
 	goproto "google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	"go.opentelemetry.io/collector/internal"
 	otlpcollectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
 	otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1"
+	"go.opentelemetry.io/collector/model/internal"
 )
 
 func TestSpanCount(t *testing.T) {