Skip to content

[8.19](backport #45667) Bump prometheus/prometheus to 0.305.0#45863

Merged
khushijain21 merged 3 commits into8.19from
mergify/bp/8.19/pr-45667
Aug 13, 2025
Merged

[8.19](backport #45667) Bump prometheus/prometheus to 0.305.0#45863
khushijain21 merged 3 commits into8.19from
mergify/bp/8.19/pr-45667

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2025

Proposed commit message

Bump prometheus/prometheus to 0.305.0

This resolves a breaking change to the textparser constructor and some deprecations. Because the internal representation of labels changed, we also needed to update some loops. The changes were caused by the following upstream change: prometheus/prometheus#16228.

This is update blocks the update to Otel 0.130.0 in agent. This is the version of the prometheus library used by the prometheus receiver. When importing both beats and that receiver, we get a conflict. CC @andrzej-stencel

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] 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
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues


This is an automatic backport of pull request #45667 done by [Mergify](https://mergify.com).

* Bump prometheus/prometheus to 0.305.0

This resolves a breaking change to the textparser constructor and some
deprecations. Because the internal represenation of labels changed, we
also needed to update some loops.

* Update documentation

* make update

(cherry picked from commit d243194)

# Conflicts:
#	docs/reference/metricbeat/metricbeat-metricset-openmetrics-collector.md
#	go.mod
#	go.sum
#	metricbeat/module/openmetrics/collector/_meta/data.json
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 8, 2025
@mergify mergify bot requested review from a team as code owners August 8, 2025 15:24
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Aug 8, 2025

Cherry-pick of d243194 has failed:

On branch mergify/bp/8.19/pr-45667
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit d24319456.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   metricbeat/helper/prometheus/textparse.go
	modified:   metricbeat/module/openmetrics/collector/data.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/reference/metricbeat/metricbeat-metricset-openmetrics-collector.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   metricbeat/module/openmetrics/collector/_meta/data.json

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

@mergify mergify bot requested review from AndersonQ and removed request for a team August 8, 2025 15:24
@mergify mergify bot requested a review from belimawr August 8, 2025 15:24
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 8, 2025
@github-actions github-actions bot added dependency Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Aug 8, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 8, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Aug 11, 2025

This pull request has not been merged yet. Could you please review and merge it @swiatekm? 🙏

@khushijain21 khushijain21 enabled auto-merge (squash) August 13, 2025 05:12
@khushijain21 khushijain21 merged commit 92a8706 into 8.19 Aug 13, 2025
203 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-45667 branch August 13, 2025 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants