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

Re-add flag for ocb build to enable version number #665

Merged
merged 3 commits into from
Sep 27, 2024

Conversation

jackgopack4
Copy link
Contributor

Description
This re-enables the functionality to set a version number for ocb binary (cmd/builder). It was erroneously removed.

Link to tracking issue
Along with open-telemetry/opentelemetry-collector#11208, closes #664.

Testing
ran build and release cycles inside personal fork repositories (jackgopack4/opentelemetry-collector and jackgopack4/opentelemetry-collector-releases)

Documentation
none, small bugfix

@jackgopack4 jackgopack4 changed the title test adding flag for ocb build Re-add flag for ocb build to enable version number Sep 19, 2024
@jackgopack4 jackgopack4 marked this pull request as ready for review September 19, 2024 14:51
@jackgopack4 jackgopack4 requested a review from a team as a code owner September 19, 2024 14:51
@mx-psi
Copy link
Member

mx-psi commented Sep 19, 2024

Do we need open-telemetry/opentelemetry-collector#11208 before merging this?

@jackgopack4
Copy link
Contributor Author

@mx-psi we don't need #11208 before merging this; ocb will still build with this flag but it won't successfully get the version from cobra command unless #11208 is also merged, so we can't close #664 until then

bogdandrutu pushed a commit to open-telemetry/opentelemetry-collector that referenced this pull request Sep 24, 2024
Revert "[chore] delete code to set a version and date, as it it not used
(#10715)"
Remove date string but re-add functions that check for version number
This (mostly) reverts commit b53f57d.

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This re-enables the functionality to set a version number for ocb binary
(cmd/builder). It was erroneously removed. It also adds unit tests for
this functionality, as a warning is given on CI with no code coverage.

<!-- Issue number if applicable -->
#### Link to tracking issue
Relates to
open-telemetry/opentelemetry-collector-releases#664.
Closes #11220 along with
open-telemetry/opentelemetry-collector-releases#665

<!--Describe what testing was performed and which tests were added.-->
#### Testing
ran build and release cycles inside personal fork repositories
(jackgopack4/opentelemetry-collector and
jackgopack4/opentelemetry-collector-releases)
<!--Describe the documentation added.-->
#### Documentation
.chloggen file
<!--Please delete paragraphs that you did not use before submitting.-->
@chan-tim-sumo
Copy link

hey @TylerHelmuth can you take a look at this PR? currently blocked from this since this is needed to get a new release out for customers from my side. thanks!

@TylerHelmuth TylerHelmuth merged commit 24c11af into open-telemetry:main Sep 27, 2024
48 checks passed
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.

OCB v0.107.0 and onward no longer report version on command line
5 participants