Skip to content

Commit

Permalink
move cmd/pdatagen -> model/internal/cmd/pdatagen (#4243)
Browse files Browse the repository at this point in the history
* move cmd/pdatagen -> model/internal/pdatagen

* move to model/internal/cmd

* update changelog
  • Loading branch information
Alex Boten authored Oct 22, 2021
1 parent 108a49e commit c3aa782
Show file tree
Hide file tree
Showing 22 changed files with 34 additions and 33 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions model/pdata/generated_common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_common_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_log.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_log_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_metrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_metrics_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_resource.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_resource_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_trace.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions model/pdata/generated_trace_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c3aa782

Please sign in to comment.