Skip to content

Update opentelemetry-collector version #38462

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

Merged
merged 6 commits into from
Mar 7, 2025

Conversation

mattsains
Copy link
Contributor

@mattsains mattsains commented Mar 7, 2025

Description

I ran make genotelcontribcol && make update-otel to generate this PR. I also added some manual changes to opampsupervisor to update a reference that was renamed. This should fix the contrib matrix tests

Fixes #38459

Copy link
Contributor

@evan-bradley evan-bradley left a comment

Choose a reason for hiding this comment

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

Thank you!

Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

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

@mattsains
Copy link
Contributor Author

@songy23 do you have a recommendation on how to fix this? It's my first time doing this and expected that the two make commands would mostly select the right versions

@songy23
Copy link
Member

songy23 commented Mar 7, 2025

Looking at the diffs you can do a simple find and replace in all go.mod: v1.27.1-0.20250307145831-dc9250a6c150 -> v1.27.1-0.20250307164521-7c787571daa5 + v0.121.1-0.20250307164521-7c787571daa5 -> v0.121.1-0.20250307145831-dc9250a6c150, then run make gotidy, then verify with ./.github/workflows/scripts/check-collector-module-version.sh

(IDK if there is an easier way, working with update-otel has always been a pain for me)

@codeboten
Copy link
Contributor

@mattsains I'm also surprised that make update-otel missed so many dependencies this time around. I guess manually updating the mod files w/ the suggested changes should fix the CI, but it's likely something else is going on here that's causing this pain

@mattsains
Copy link
Contributor Author

mattsains commented Mar 7, 2025

I tried the updates suggested by @songy23 and the script just reverted the change, so I just let the script run and commit that, hopefully that's good?

@codeboten codeboten merged commit 6a86096 into open-telemetry:main Mar 7, 2025
168 of 170 checks passed
@github-actions github-actions bot added this to the next release milestone Mar 7, 2025
@mattsains mattsains deleted the update-go-contrib branch March 7, 2025 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update-otel workflow failed
5 participants