Update OTel components to v0.120.x#7663
Closed
mauri870 wants to merge 22 commits intoelastic:mainfrom
Closed
Conversation
…ntrib\/.*\) v0\.119\.0/\1 v0.120.0/' go.mod
sed -i 's/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) v0\.120\.0/\1 v0.120.1/' go.mod
I deleted the line importing Prometheus `v0.300.1` from `go.mod` and ran `go mod tidy`. That restored the dependency in `v0.54.1` version.
cmacknz
reviewed
Apr 1, 2025
| // fsnotify and goja are required for beats import | ||
| github.com/fsnotify/fsnotify => github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 | ||
| // v0.0.0-20250317163643-19cd4e80024f is equivalent to the upstream v0.120.0 release with the Prometheus 0.300 dependency update removed, as it introduced unwanted breaking changes that conflict with Beats. | ||
| github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/elastic/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250317163643-19cd4e80024f |
Member
There was a problem hiding this comment.
This is actually pinned at v0.120.0 because v0.120.1 is a bug fix in the prometheus updates that we removed.
Pinning the rest to v0.120.1 is fine as long as we don't pull in both the v0.120.0 and v0.120.1 versions of contrib through this replace.
Member
Author
|
/test |
1 similar comment
Member
Author
|
/test |
Contributor
|
/test |
|
Contributor
⏳ Build in-progress, with failures
Failed CI Steps
History
cc @mauri870 |
Contributor
|
This pull request is now in conflicts. Could you fix it? 🙏 |
8 tasks
This was referenced Apr 7, 2025
Member
Author
|
Closing this since we migrated directly to v0.121.0 in #7686. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.





What does this PR do?
Updates OTel components to v0.120.0 (core) and v0.120.1 (contrib).
This is a copy of #6912 with the conflicts fixed.
Why is it important?
We should be keeping the components up to date with upstream as much as possible.
OpenTelemetry Collector Contrib updated its
github.com/prometheus/prometheusdependency fromv0.54.1tov0.300.1in v0.120.0 (open-telemetry/opentelemetry-collector-contrib#36873). This resulted in a conflict with Prometheus v0.54.x dependency in Beats. This forced us to temporarily fork the Contrib, revert thev0.300.xupdate there (elastic/opentelemetry-collector-contrib#3) and import the forkedprometheusreceivermodule (ca402c6). This resolves the dependency conflict. This was already done on9.0branch in #7411 and now we're doing the same thing onmainbranch.The plan is to return to upstream, non-forked components as soon as Beats are updated to Prometheus v0.300.x.
Checklist
[ ] I have commented my code, particularly in hard-to-understand areas[ ] I have made corresponding change to the default configuration files[ ] I have added tests that prove my fix is effective or that my feature works./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testHow to test this PR locally