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

make update-otel #34694

Merged
merged 1 commit into from
Sep 11, 2024
Merged

make update-otel #34694

merged 1 commit into from
Sep 11, 2024

Conversation

led0nk
Copy link
Contributor

@led0nk led0nk commented Aug 14, 2024

Description:

Link to tracking Issue:

Testing:

Documentation:

So at first i reordered the update-otel command, because there was no sense in first updating the builder-configs (with the use of go.mod file) and then updating go.mod-files.

Furthermore since the main go.mod-file has moved:
cfd83af#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6

I changed the source-file to cmd/otelcontribcol/go.mod

@led0nk led0nk requested review from a team and bogdandrutu August 14, 2024 22:08
@crobert-1 crobert-1 added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Aug 15, 2024
Copy link
Contributor

This PR was marked stale due to lack of activity. It will be closed in 14 days.

@github-actions github-actions bot added the Stale label Aug 30, 2024
@led0nk
Copy link
Contributor Author

led0nk commented Sep 7, 2024

@mx-psi could you have a look at this? I think it should solve the problem with make update-otel

@github-actions github-actions bot removed the Stale label Sep 8, 2024
Copy link
Member

@mx-psi mx-psi left a comment

Choose a reason for hiding this comment

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

Thanks, I think this should work. I am going to wait until the current release is done to merge this

Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

thanks @led0nk

@mx-psi mx-psi added the ready to merge Code review completed; ready to merge by maintainers label Sep 10, 2024
@mx-psi mx-psi merged commit 413477e into open-telemetry:main Sep 11, 2024
168 of 169 checks passed
@github-actions github-actions bot added this to the next release milestone Sep 11, 2024
@mx-psi
Copy link
Member

mx-psi commented Sep 12, 2024

This was a step in the right direction, but it looks like there are still a couple manual steps left.

For example, check-module-collector-version failed on #35158: https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158. One solution is to move git diff on that script out, and run the script as part of make update-otel before make gotidy.

Another cumbersome thing is replacing the toolchain directive manually, we can solve that independently

@mx-psi
Copy link
Member

mx-psi commented Sep 12, 2024

Filed #35159 and #35160 for this.

jriguera pushed a commit to springernature/opentelemetry-collector-contrib that referenced this pull request Oct 4, 2024
**Description:** <Describe what has changed.>
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->

**Link to tracking Issue:** <Issue number if applicable>
- Resolves open-telemetry#21632 

**Testing:** <Describe what testing was performed and which tests were
added.>

**Documentation:** <Describe the documentation added.>

So at first i reordered the `update-otel` command, because there was no
sense in first updating the builder-configs (with the use of go.mod
file) and then updating `go.mod`-files.

Furthermore since the main `go.mod`-file has moved:

open-telemetry@cfd83af#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6

I changed the source-file to `cmd/otelcontribcol/go.mod`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready to merge Code review completed; ready to merge by maintainers Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[chore] [CI] Include updating the otelcontribcol ocb manifest in make update-otel target
4 participants