Skip to content

Commit

Permalink
[tracegen] move component under cmd (#12475)
Browse files Browse the repository at this point in the history
* [tracegen] move component under cmd

Fixes #12474

* update makefile include path
  • Loading branch information
Alex Boten authored Jul 18, 2022
1 parent b2c9d58 commit 20bc681
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@

cmd/chloggen/ @open-telemetry/collector-contrib-approvers @djaglowski
cmd/mdatagen/ @open-telemetry/collector-contrib-approvers @dmitryax
cmd/telemetrygen/ @open-telemetry/collector-contrib-approvers @mx-psi @amenasria @codeboten
cmd/otelcontribcol/ @open-telemetry/collector-contrib-approvers @codeboten
cmd/telemetrygen/ @open-telemetry/collector-contrib-approvers @mx-psi @amenasria @codeboten
cmd/tracegen/ @open-telemetry/collector-contrib-approvers @jpkrohling

exporter/alibabacloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
exporter/awscloudwatchlogsexporter/ @open-telemetry/collector-contrib-approvers @boostchicken
Expand Down Expand Up @@ -190,4 +191,3 @@ receiver/windowsperfcountersreceiver/ @open-telemetry/collector-c
receiver/zipkinreceiver/ @open-telemetry/collector-contrib-approvers @pmm-sumo
receiver/zookeeperreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski

tracegen/ @open-telemetry/collector-contrib-approvers @jpkrohling
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ updates:
directory: "/cmd/mdatagen"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/cmd/tracegen"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/examples/demo/client"
schedule:
Expand Down Expand Up @@ -678,7 +682,3 @@ updates:
directory: "/testbed/mockdatareceivers/mockawsxrayreceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/tracegen"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/tracegen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Build tracegen
uses: docker/build-push-action@v3
with:
context: tracegen
context: cmd/tracegen
push: false
tags: ghcr.io/open-telemetry/opentelemetry-collector-contrib/tracegen:dev

Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions cmd/tracegen/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../../Makefile.Common
2 changes: 1 addition & 1 deletion tracegen/README.md → cmd/tracegen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This utility simulates a client generating traces, useful for testing and demons
To install the latest version run the following command:

```console
$ go install github.com/open-telemetry/opentelemetry-collector-contrib/tracegen@latest
$ go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen@latest
```

Check the [`go install` reference](https://go.dev/ref/mod#go-install) to install specific versions.
Expand Down
2 changes: 1 addition & 1 deletion tracegen/go.mod → cmd/tracegen/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/tracegen
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen

go 1.17

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package tracegen // import "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen/internal/tracegen"
package tracegen // import "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen/internal/tracegen"

import (
"flag"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package tracegen // import "github.com/open-telemetry/opentelemetry-collector-contrib/tracegen/internal/tracegen"
package tracegen // import "github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen/internal/tracegen"

import (
"context"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tracegen/main.go → cmd/tracegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"go.uber.org/zap"
"google.golang.org/grpc"

"github.com/open-telemetry/opentelemetry-collector-contrib/tracegen/internal/tracegen"
"github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen/internal/tracegen"
)

func main() {
Expand Down
1 change: 0 additions & 1 deletion tracegen/Makefile

This file was deleted.

16 changes: 16 additions & 0 deletions unreleased/mv-tracegen.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: tracegen

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Moving component under `cmd` for consistency"

# One or more tracking issues related to the change
issues: [ 12474 ]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ module-sets:
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/testbed
- github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver
- github.com/open-telemetry/opentelemetry-collector-contrib/tracegen
- github.com/open-telemetry/opentelemetry-collector-contrib/cmd/tracegen

excluded-modules:
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/tools

0 comments on commit 20bc681

Please sign in to comment.