-
Notifications
You must be signed in to change notification settings - Fork 169
Update OTel components to v0.120.x #6912
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
Update OTel components to v0.120.x #6912
Conversation
…ntrib\/.*\) v0\.119\.0/\1 v0.120.0/' go.mod
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
I've created elastic/beats#42748 to resolve the dependency conflict, appreciate any help on this. 🙏 |
sed -i 's/\(github\.com\/open-telemetry\/opentelemetry\-collector\-contrib\/.*\) v0\.120\.0/\1 v0.120.1/' go.mod
|
We can now unblock this using the same approach that was used in #7411 We can pin to v0.120 but to go past that we need beats to update to prometheus v0.300 or keep forking OTel releases which I do not want to do. |
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.
Agree. Updating Beats to Prometheus v0.300 is the way to unblock further OTel updates. |
| [nopreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/nopreceiver/v0.120.0/receiver/nopreceiver/README.md) | v0.120.0 | | ||
| [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/blob/receiver/otlpreceiver/v0.120.0/receiver/otlpreceiver/README.md) | v0.120.0 | | ||
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.120.1/receiver/prometheusreceiver/README.md) | v0.120.1 | | ||
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/=> github.com/elastic/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250317163643-19cd4e80024f/receiver/prometheusreceiver/README.md) | => 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 wrong, but we can merge this PR first, and then the fix alongside #7456.
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.
I was thinking you rebase your PR on this PR so that we can prove it's doing the right thing?
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.
That PR is now merged, you can rebase on main and regenerate the README.
|
💔 Build Failed
Failed CI Steps
History
|
This pull request is now in conflicts. Could you fix it? 🙏
|
Superseded by #7686. |
What does this PR do?
Updates OTel components to v0.120.0 (core) and v0.120.1 (contrib).
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