[8.19](backport #45886) Match prometheus version with upstream prometheusreceivers'#45924
Merged
khushijain21 merged 4 commits into8.19from Aug 13, 2025
Merged
[8.19](backport #45886) Match prometheus version with upstream prometheusreceivers'#45924khushijain21 merged 4 commits into8.19from
khushijain21 merged 4 commits into8.19from
Conversation
(cherry picked from commit 2e0b894) # Conflicts: # NOTICE.txt # go.mod # go.sum
Contributor
Author
|
Cherry-pick of 2e0b894 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Contributor
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
khushijain21
approved these changes
Aug 13, 2025
Contributor
Author
|
This pull request is now in conflicts. Could you fix it? 🙏 |
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.
Proposed commit message
Match the
prometheus/prometheusversion used by upstreamprometheusreceiverto avoid dependency conflict inelastic-agentChecklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Why is it required
Description
Currently,
prometheusreceiveruses an unreleased version ofprometheus/prometheuswhich uses the latest version of
oteltranslator( reverted in thev0.305.0release prometheus/prometheus@3253ba6 )This mismatch is causing dependency conflict when updating otel collector dependencies in elastic-agent
Compilation error as follows
This is an automatic backport of pull request #45886 done by [Mergify](https://mergify.com).