Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move opentelemetry-collector-builder to core #4286

Merged
merged 42 commits into from
Oct 28, 2021

Conversation

jpkrohling
Copy link
Member

@jpkrohling jpkrohling commented Oct 28, 2021

This PR brings the opentelemetry-collector-builder repository to the core.

This was done by taking the builder repository, moving all its contents to the "builder" directory, adding that repository as a remote to this, and performing a merge with unrelated histories (--allow-unrelated-histories). This should not be squashed, so that the history is kept.

Closes #4275

List of commits:
- Initial commit

Bogdan Drutu and others added 30 commits January 27, 2021 15:48
* Add CODEOWNERS file

* Update CODEOWNERS
Signed-off-by: Joe Elliott <[email protected]>
Closes #9

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Fixes #16

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Signed-off-by: Ashmita Bohara <[email protected]>
* pass errors from cobra execute back to main

* print the error
…#30)

* Generate a warning if the builder and collector base version mismatch

* Show current default version in the warning message
* Sync build and CI Go versions at latest 1.16

* Run go mod tidy

* Set go binary to use in the compilation phase in tests

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

Co-authored-by: Juraci Paixão Kröhling <[email protected]>
* Issue#24 Add option to generate go code only (no compile)

* Update cmd/root.go logging

Suggested by @jpkkrohling

Co-authored-by: Juraci Paixão Kröhling <[email protected]>

* remove verbose help .. created by corba

* suggestion by jpkrohling to keep generateandcompile

* lint error: remove unused var

* reword cmd option and add back help message for default

Co-authored-by: Juraci Paixão Kröhling <[email protected]>
* Update to Collector v0.28.0

Closes #48

Addresses the breaking API change in
open-telemetry#3163,
besides the usual version number changes.

Signed-off-by: Fangyi Zhou <[email protected]>

* Use `go mod tidy` instead of `go mod download`

It appears that this magically resolves the go.mod file issue.
https://stackoverflow.com/questions/67203641/missing-go-sum-entry-for-module-providing-package-package-name

Signed-off-by: Fangyi Zhou <[email protected]>
* Update replaces.builder.yaml

* Update nocore.builder.yaml

* Update config.go

* Update README.md

* Update main.go
Signed-off-by: Anthony J Mirabella <[email protected]>
Aneurysm9 and others added 10 commits August 25, 2021 07:40
Signed-off-by: Anthony J Mirabella <[email protected]>

Co-authored-by: Juraci Paixão Kröhling <[email protected]>
* Support building with Go 1.17
Fixes #65

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Update workflows to use Go 1.17

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

* Add gosec exceptions for exec.Command

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Fixes #67

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
* update main to include windows service code

* use main version from tag 0.35.0

* update main function

* align with upstream v0.36.0 tag

* dummy change to trigger build

* Revert "dummy change to trigger build"

This reverts commit 629d499461da2d2c240bf1e495b5fe0558e3547f.
Fixes #15

Signed-off-by: yugo-horie <[email protected]>
* release 0.37.0

* update use of NewCommand
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
@jpkrohling jpkrohling requested review from a team and Aneurysm9 October 28, 2021 11:38
Copy link
Member

@bogdandrutu bogdandrutu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer cmd/builder please

@jpkrohling
Copy link
Member Author

I would prefer cmd/builder please

For the whole builder repository?

@bogdandrutu
Copy link
Member

@jpkrohling yes was thinking for the whole. Let's just merge it anywhere then we can move.

@bogdandrutu bogdandrutu marked this pull request as ready for review October 28, 2021 20:22
@bogdandrutu bogdandrutu merged commit 4063a46 into open-telemetry:main Oct 28, 2021
bogdandrutu pushed a commit that referenced this pull request Oct 28, 2021
bogdandrutu added a commit that referenced this pull request Oct 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move opentelemetry-collector-builder into this repository