From c3aa7829aaac0d372d1722d2ee7ce83ed2daa871 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 22 Oct 2021 15:59:35 -0700 Subject: [PATCH] move cmd/pdatagen -> model/internal/cmd/pdatagen (#4243) * move cmd/pdatagen -> model/internal/pdatagen * move to model/internal/cmd * update changelog --- CHANGELOG.md | 1 + Makefile | 2 +- .../internal/cmd}/pdatagen/internal/base_fields.go | 2 +- .../internal/cmd}/pdatagen/internal/base_slices.go | 2 +- .../internal/cmd}/pdatagen/internal/base_structs.go | 2 +- .../internal/cmd}/pdatagen/internal/common_structs.go | 2 +- {cmd => model/internal/cmd}/pdatagen/internal/files.go | 6 +++--- .../internal/cmd}/pdatagen/internal/log_structs.go | 2 +- .../internal/cmd}/pdatagen/internal/metrics_structs.go | 2 +- .../internal/cmd}/pdatagen/internal/resource_structs.go | 2 +- .../internal/cmd}/pdatagen/internal/trace_structs.go | 2 +- {cmd => model/internal/cmd}/pdatagen/main.go | 2 +- model/pdata/generated_common.go | 4 ++-- model/pdata/generated_common_test.go | 4 ++-- model/pdata/generated_log.go | 4 ++-- model/pdata/generated_log_test.go | 4 ++-- model/pdata/generated_metrics.go | 4 ++-- model/pdata/generated_metrics_test.go | 4 ++-- model/pdata/generated_resource.go | 4 ++-- model/pdata/generated_resource_test.go | 4 ++-- model/pdata/generated_trace.go | 4 ++-- model/pdata/generated_trace_test.go | 4 ++-- 22 files changed, 34 insertions(+), 33 deletions(-) rename {cmd => model/internal/cmd}/pdatagen/internal/base_fields.go (99%) rename {cmd => model/internal/cmd}/pdatagen/internal/base_slices.go (99%) rename {cmd => model/internal/cmd}/pdatagen/internal/base_structs.go (97%) rename {cmd => model/internal/cmd}/pdatagen/internal/common_structs.go (97%) rename {cmd => model/internal/cmd}/pdatagen/internal/files.go (92%) rename {cmd => model/internal/cmd}/pdatagen/internal/log_structs.go (97%) rename {cmd => model/internal/cmd}/pdatagen/internal/metrics_structs.go (99%) rename {cmd => model/internal/cmd}/pdatagen/internal/resource_structs.go (92%) rename {cmd => model/internal/cmd}/pdatagen/internal/trace_structs.go (98%) rename {cmd => model/internal/cmd}/pdatagen/main.go (93%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef1990f569b..c02b9c860db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Rename `parserprovider.MapProvider` as `config.MapProvider` (#4178) - Rename `parserprovider.Watchable` as `config.WatchableMapProvider` (#4178) - Remove deprecated no-op flags to setup Collector's logging "--log-level", "--log-profile", "--log-format" (#4213) +- Move `cmd/pdatagen` as internal package `model/internal/cmd/pdatagen` (#4243) ## v0.37.0 Beta diff --git a/Makefile b/Makefile index 049abf45d58..ebd8d457386 100644 --- a/Makefile +++ b/Makefile @@ -360,7 +360,7 @@ genproto_sub: # Generate structs, functions and tests for pdata package. Must be used after any changes # to proto and after running `make genproto` genpdata: - go run cmd/pdatagen/main.go + go run model/internal/cmd/pdatagen/main.go $(MAKE) fmt # Generate semantic convention constants. Requires a clone of the opentelemetry-specification repo diff --git a/cmd/pdatagen/internal/base_fields.go b/model/internal/cmd/pdatagen/internal/base_fields.go similarity index 99% rename from cmd/pdatagen/internal/base_fields.go rename to model/internal/cmd/pdatagen/internal/base_fields.go index cd633506b81..524ca2ed4f7 100644 --- a/cmd/pdatagen/internal/base_fields.go +++ b/model/internal/cmd/pdatagen/internal/base_fields.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" import ( "os" diff --git a/cmd/pdatagen/internal/base_slices.go b/model/internal/cmd/pdatagen/internal/base_slices.go similarity index 99% rename from cmd/pdatagen/internal/base_slices.go rename to model/internal/cmd/pdatagen/internal/base_slices.go index 62ab4c84925..c1cead16595 100644 --- a/cmd/pdatagen/internal/base_slices.go +++ b/model/internal/cmd/pdatagen/internal/base_slices.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" import ( "os" diff --git a/cmd/pdatagen/internal/base_structs.go b/model/internal/cmd/pdatagen/internal/base_structs.go similarity index 97% rename from cmd/pdatagen/internal/base_structs.go rename to model/internal/cmd/pdatagen/internal/base_structs.go index d90760efb7d..4bf219d89ff 100644 --- a/cmd/pdatagen/internal/base_structs.go +++ b/model/internal/cmd/pdatagen/internal/base_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" import ( "os" diff --git a/cmd/pdatagen/internal/common_structs.go b/model/internal/cmd/pdatagen/internal/common_structs.go similarity index 97% rename from cmd/pdatagen/internal/common_structs.go rename to model/internal/cmd/pdatagen/internal/common_structs.go index c024f5eedf4..e4b3488a5de 100644 --- a/cmd/pdatagen/internal/common_structs.go +++ b/model/internal/cmd/pdatagen/internal/common_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" var commonFile = &File{ Name: "common", diff --git a/cmd/pdatagen/internal/files.go b/model/internal/cmd/pdatagen/internal/files.go similarity index 92% rename from cmd/pdatagen/internal/files.go rename to model/internal/cmd/pdatagen/internal/files.go index a8b1b0048eb..e341a3cb7e7 100644 --- a/cmd/pdatagen/internal/files.go +++ b/model/internal/cmd/pdatagen/internal/files.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" import "strings" @@ -30,8 +30,8 @@ const header = `// Copyright The OpenTelemetry Authors // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata` diff --git a/cmd/pdatagen/internal/log_structs.go b/model/internal/cmd/pdatagen/internal/log_structs.go similarity index 97% rename from cmd/pdatagen/internal/log_structs.go rename to model/internal/cmd/pdatagen/internal/log_structs.go index e4500d7b526..4b7c27d33d1 100644 --- a/cmd/pdatagen/internal/log_structs.go +++ b/model/internal/cmd/pdatagen/internal/log_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" var logFile = &File{ Name: "log", diff --git a/cmd/pdatagen/internal/metrics_structs.go b/model/internal/cmd/pdatagen/internal/metrics_structs.go similarity index 99% rename from cmd/pdatagen/internal/metrics_structs.go rename to model/internal/cmd/pdatagen/internal/metrics_structs.go index 1be0b1c5a26..54817908fb7 100644 --- a/cmd/pdatagen/internal/metrics_structs.go +++ b/model/internal/cmd/pdatagen/internal/metrics_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" var metricsFile = &File{ Name: "metrics", diff --git a/cmd/pdatagen/internal/resource_structs.go b/model/internal/cmd/pdatagen/internal/resource_structs.go similarity index 92% rename from cmd/pdatagen/internal/resource_structs.go rename to model/internal/cmd/pdatagen/internal/resource_structs.go index 2f42384f8af..fcf922c0861 100644 --- a/cmd/pdatagen/internal/resource_structs.go +++ b/model/internal/cmd/pdatagen/internal/resource_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" var resourceFile = &File{ Name: "resource", diff --git a/cmd/pdatagen/internal/trace_structs.go b/model/internal/cmd/pdatagen/internal/trace_structs.go similarity index 98% rename from cmd/pdatagen/internal/trace_structs.go rename to model/internal/cmd/pdatagen/internal/trace_structs.go index 6f8d90c54c0..08fd554cc9c 100644 --- a/cmd/pdatagen/internal/trace_structs.go +++ b/model/internal/cmd/pdatagen/internal/trace_structs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal // import "go.opentelemetry.io/collector/cmd/pdatagen/internal" +package internal // import "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" var traceFile = &File{ Name: "trace", diff --git a/cmd/pdatagen/main.go b/model/internal/cmd/pdatagen/main.go similarity index 93% rename from cmd/pdatagen/main.go rename to model/internal/cmd/pdatagen/main.go index 3b4101a7426..afb96b4e716 100644 --- a/cmd/pdatagen/main.go +++ b/model/internal/cmd/pdatagen/main.go @@ -17,7 +17,7 @@ package main import ( "os" - "go.opentelemetry.io/collector/cmd/pdatagen/internal" + "go.opentelemetry.io/collector/model/internal/cmd/pdatagen/internal" ) func check(e error) { diff --git a/model/pdata/generated_common.go b/model/pdata/generated_common.go index 1c411d2d6e4..0f970e6c6ae 100644 --- a/model/pdata/generated_common.go +++ b/model/pdata/generated_common.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_common_test.go b/model/pdata/generated_common_test.go index 3ef9f668ada..1a61fe3a24d 100644 --- a/model/pdata/generated_common_test.go +++ b/model/pdata/generated_common_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_log.go b/model/pdata/generated_log.go index a07ccdedaaf..110c9f88df5 100644 --- a/model/pdata/generated_log.go +++ b/model/pdata/generated_log.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_log_test.go b/model/pdata/generated_log_test.go index 7b09fec026a..001c7b7fc40 100644 --- a/model/pdata/generated_log_test.go +++ b/model/pdata/generated_log_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_metrics.go b/model/pdata/generated_metrics.go index 047d1614f00..3e0f2555c97 100644 --- a/model/pdata/generated_metrics.go +++ b/model/pdata/generated_metrics.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_metrics_test.go b/model/pdata/generated_metrics_test.go index 9306166c5a8..941a3c23f25 100644 --- a/model/pdata/generated_metrics_test.go +++ b/model/pdata/generated_metrics_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_resource.go b/model/pdata/generated_resource.go index 9b98bb84172..6e44dd276a4 100644 --- a/model/pdata/generated_resource.go +++ b/model/pdata/generated_resource.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_resource_test.go b/model/pdata/generated_resource_test.go index cff3992e35f..bc8295cd0db 100644 --- a/model/pdata/generated_resource_test.go +++ b/model/pdata/generated_resource_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_trace.go b/model/pdata/generated_trace.go index 3a2f17e5dd9..e72a55b6329 100644 --- a/model/pdata/generated_trace.go +++ b/model/pdata/generated_trace.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata diff --git a/model/pdata/generated_trace_test.go b/model/pdata/generated_trace_test.go index 81af159405a..3eb4b35ccc3 100644 --- a/model/pdata/generated_trace_test.go +++ b/model/pdata/generated_trace_test.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Code generated by "cmd/pdatagen/main.go". DO NOT EDIT. -// To regenerate this file run "go run cmd/pdatagen/main.go". +// Code generated by "model/internal/cmd/pdatagen/main.go". DO NOT EDIT. +// To regenerate this file run "go run model/internal/cmd/pdatagen/main.go". package pdata