[pdata] Unpack model/internal/pdata package into model/internal (#5162)

To avoid confusion with `model/pdata` package and future `pdata` module
open-telemetry · Apr 6, 2022 · c51773a · c51773a
1 parent a1c539a
commit c51773a
Show file tree

Hide file tree

Showing 50 changed files with 372 additions and 369 deletions.
diff --git a/model/internal/cmd/pdatagen/internal/base_slices.go b/model/internal/cmd/pdatagen/internal/base_slices.go
@@ -111,11 +111,11 @@ func fillTest${structName}(tv ${structName}) {
 	}
 }`
 
-const commonSliceAliasTemplate = `// ${structName} is an alias for pdata.${structName} struct.
-type ${structName} = pdata.${structName}
+const commonSliceAliasTemplate = `// ${structName} is an alias for internal.${structName} struct.
+type ${structName} = internal.${structName}
 
 // New${structName} is an alias for a function to create ${structName}.
-var New${structName} = pdata.New${structName}`
+var New${structName} = internal.New${structName}`
 
 const slicePtrTemplate = `// ${structName} logically represents a slice of ${elementName}.
 //

diff --git a/model/internal/cmd/pdatagen/internal/base_structs.go b/model/internal/cmd/pdatagen/internal/base_structs.go
@@ -78,11 +78,11 @@ const messageValueGenerateTestTemplate = `func generateTest${structName}() ${str
 const messageValueFillTestHeaderTemplate = `func fillTest${structName}(tv ${structName}) {`
 const messageValueFillTestFooterTemplate = `}`
 
-const messageValueAliasTemplate = `// ${structName} is an alias for pdata.${structName} struct.
-type ${structName} = pdata.${structName} 
+const messageValueAliasTemplate = `// ${structName} is an alias for internal.${structName} struct.
+type ${structName} = internal.${structName} 
 
 // New${structName} is an alias for a function to create a new empty ${structName}.
-var New${structName} = pdata.New${structName}`
+var New${structName} = internal.New${structName}`
 
 const newLine = "\n"
 

diff --git a/model/internal/cmd/pdatagen/internal/files.go b/model/internal/cmd/pdatagen/internal/files.go
diff --git a/model/internal/cmd/pdatagen/main.go b/model/internal/cmd/pdatagen/main.go
@@ -28,12 +28,12 @@ func check(e error) {
 
 func main() {
 	for _, fp := range internal.AllFiles {
-		f, err := os.Create("./model/internal/pdata/generated_" + fp.Name + ".go")
+		f, err := os.Create("./model/internal/generated_" + fp.Name + ".go")
 		check(err)
 		_, err = f.WriteString(fp.GenerateFile())
 		check(err)
 		check(f.Close())
-		f, err = os.Create("./model/internal/pdata/generated_" + fp.Name + "_test.go")
+		f, err = os.Create("./model/internal/generated_" + fp.Name + "_test.go")
 		check(err)
 		_, err = f.WriteString(fp.GenerateTestFile())
 		check(err)

diff --git a/model/internal/pdata/common.go → model/internal/common.go b/model/internal/pdata/common.go → model/internal/common.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 // This file contains data structures that are common for all telemetry types,
 // such as timestamps, attributes, etc.

diff --git a/model/internal/pdata/common_test.go → model/internal/common_test.go b/model/internal/pdata/common_test.go → model/internal/common_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"encoding/base64"

diff --git a/model/internal/pdata/generated_common.go → model/internal/generated_common.go b/model/internal/pdata/generated_common.go → model/internal/generated_common.go
diff --git a/...l/internal/pdata/generated_common_test.go → model/internal/generated_common_test.go b/...l/internal/pdata/generated_common_test.go → model/internal/generated_common_test.go
diff --git a/model/internal/pdata/generated_log.go → model/internal/generated_log.go b/model/internal/pdata/generated_log.go → model/internal/generated_log.go
diff --git a/model/internal/pdata/generated_log_test.go → model/internal/generated_log_test.go b/model/internal/pdata/generated_log_test.go → model/internal/generated_log_test.go
diff --git a/model/internal/pdata/generated_metrics.go → model/internal/generated_metrics.go b/model/internal/pdata/generated_metrics.go → model/internal/generated_metrics.go
diff --git a/.../internal/pdata/generated_metrics_test.go → model/internal/generated_metrics_test.go b/.../internal/pdata/generated_metrics_test.go → model/internal/generated_metrics_test.go
diff --git a/model/internal/pdata/generated_resource.go → model/internal/generated_resource.go b/model/internal/pdata/generated_resource.go → model/internal/generated_resource.go
diff --git a/...internal/pdata/generated_resource_test.go → model/internal/generated_resource_test.go b/...internal/pdata/generated_resource_test.go → model/internal/generated_resource_test.go
diff --git a/model/internal/pdata/generated_trace.go → model/internal/generated_trace.go b/model/internal/pdata/generated_trace.go → model/internal/generated_trace.go
diff --git a/model/internal/pdata/generated_trace_test.go → model/internal/generated_trace_test.go b/model/internal/pdata/generated_trace_test.go → model/internal/generated_trace_test.go
diff --git a/model/internal/pdata/logs.go → model/internal/logs.go b/model/internal/pdata/logs.go → model/internal/logs.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	otlplogs "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"

diff --git a/model/internal/pdata/logs_test.go → model/internal/logs_test.go b/model/internal/pdata/logs_test.go → model/internal/logs_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/internal/pdata/metrics.go → model/internal/metrics.go b/model/internal/pdata/metrics.go → model/internal/metrics.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	otlpmetrics "go.opentelemetry.io/collector/model/internal/data/protogen/metrics/v1"

diff --git a/model/internal/pdata/metrics_test.go → model/internal/metrics_test.go b/model/internal/pdata/metrics_test.go → model/internal/metrics_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/internal/pdata/otlp_wrapper.go → model/internal/otlp_wrapper.go b/model/internal/pdata/otlp_wrapper.go → model/internal/otlp_wrapper.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	otlplogs "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"

diff --git a/model/internal/pdata/spanid.go → model/internal/spanid.go b/model/internal/pdata/spanid.go → model/internal/spanid.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	"go.opentelemetry.io/collector/model/internal/data"

diff --git a/model/internal/pdata/spanid_test.go → model/internal/spanid_test.go b/model/internal/pdata/spanid_test.go → model/internal/spanid_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/internal/pdata/timestamp.go → model/internal/timestamp.go b/model/internal/pdata/timestamp.go → model/internal/timestamp.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	"time"

diff --git a/model/internal/pdata/timestamp_test.go → model/internal/timestamp_test.go b/model/internal/pdata/timestamp_test.go → model/internal/timestamp_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/internal/pdata/traceid.go → model/internal/traceid.go b/model/internal/pdata/traceid.go → model/internal/traceid.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	"go.opentelemetry.io/collector/model/internal/data"

diff --git a/model/internal/pdata/traceid_test.go → model/internal/traceid_test.go b/model/internal/pdata/traceid_test.go → model/internal/traceid_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/internal/pdata/traces.go → model/internal/traces.go b/model/internal/pdata/traces.go → model/internal/traces.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata // import "go.opentelemetry.io/collector/model/internal/pdata"
+package internal // import "go.opentelemetry.io/collector/model/internal"
 
 import (
 	otlptrace "go.opentelemetry.io/collector/model/internal/data/protogen/trace/v1"

diff --git a/model/internal/pdata/traces_test.go → model/internal/traces_test.go b/model/internal/pdata/traces_test.go → model/internal/traces_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package pdata
+package internal
 
 import (
 	"testing"

diff --git a/model/otlp/json_marshaler.go b/model/otlp/json_marshaler.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 
-	ipdata "go.opentelemetry.io/collector/model/internal/pdata"
+	ipdata "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"
 
+	ipdata "go.opentelemetry.io/collector/model/internal"
 	otlplogs "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"
 	otlpmetrics "go.opentelemetry.io/collector/model/internal/data/protogen/metrics/v1"
 	otlptrace "go.opentelemetry.io/collector/model/internal/data/protogen/trace/v1"
-	ipdata "go.opentelemetry.io/collector/model/internal/pdata"
 	"go.opentelemetry.io/collector/model/otlpgrpc"
 	"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/model/otlp"
 
 import (
-	ipdata "go.opentelemetry.io/collector/model/internal/pdata"
+	ipdata "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/model/otlp"
 
 import (
+	ipdata "go.opentelemetry.io/collector/model/internal"
 	otlplogs "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"
 	otlpmetrics "go.opentelemetry.io/collector/model/internal/data/protogen/metrics/v1"
 	otlptrace "go.opentelemetry.io/collector/model/internal/data/protogen/trace/v1"
-	ipdata "go.opentelemetry.io/collector/model/internal/pdata"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlpgrpc/logs.go b/model/otlpgrpc/logs.go
@@ -21,10 +21,10 @@ import (
 	"github.com/gogo/protobuf/jsonpb"
 	"google.golang.org/grpc"
 
+	ipdata "go.opentelemetry.io/collector/model/internal"
 	otlpcollectorlog "go.opentelemetry.io/collector/model/internal/data/protogen/collector/logs/v1"
 	v1 "go.opentelemetry.io/collector/model/internal/data/protogen/common/v1"
 	otlplogs "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"
-	ipdata "go.opentelemetry.io/collector/model/internal/pdata"
 	"go.opentelemetry.io/collector/model/pdata"
 )
 

diff --git a/model/otlpgrpc/logs_test.go b/model/otlpgrpc/logs_test.go
@@ -32,7 +32,7 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 
 	v1 "go.opentelemetry.io/collector/model/internal/data/protogen/logs/v1"
-	"go.opentelemetry.io/collector/model/internal/pdata"
+	"go.opentelemetry.io/collector/model/pdata"
 )
 
 var _ json.Unmarshaler = LogsResponse{}