-
Notifications
You must be signed in to change notification settings - Fork 169
Update OTel components to v0.120.x #7663
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
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.
@@ -653,6 +657,8 @@ replace ( | |||
github.com/dop251/goja_nodejs => github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 | |||
// 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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
/test |
1 similar comment
/test |
/test |
|
⏳ Build in-progress, with failures
Failed CI Steps
History
cc @mauri870 |
This pull request is now in conflicts. Could you fix it? 🙏
|
Closing this since we migrated directly to v0.121.0 in #7686. |
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/prometheus
dependency fromv0.54.1
tov0.300.1
in 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.x
update there (elastic/opentelemetry-collector-contrib#3) and import the forkedprometheusreceiver
module (ca402c6). This resolves the dependency conflict. This was already done on9.0
branch in #7411 and now we're doing the same thing onmain
branch.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/fragments
using the changelog tool[ ] I have added an integration test or an E2E testHow to test this PR locally