Skip to content

Bump prometheus/prometheus to 0.305.0#45667

Merged
khushijain21 merged 3 commits intomainfrom
deps/bump-prometheus-305
Aug 8, 2025
Merged

Bump prometheus/prometheus to 0.305.0#45667
khushijain21 merged 3 commits intomainfrom
deps/bump-prometheus-305

Conversation

@swiatekm
Copy link
Contributor

@swiatekm swiatekm commented Jul 31, 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 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.
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 31, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Jul 31, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @swiatekm? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@swiatekm swiatekm added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 31, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 31, 2025
@swiatekm swiatekm added needs_team Indicates that the issue/PR needs a Team:* label dependency labels Jul 31, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 31, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jul 31, 2025

🔍 Preview links for changed docs

@swiatekm swiatekm added the backport-8.19 Automated backport to the 8.19 branch label Aug 1, 2025
@swiatekm swiatekm marked this pull request as ready for review August 1, 2025 11:44
@swiatekm swiatekm requested review from a team as code owners August 1, 2025 11:44
@elasticmachine
Copy link
Contributor

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

@khushijain21 khushijain21 merged commit d243194 into main Aug 8, 2025
205 checks passed
@khushijain21 khushijain21 deleted the deps/bump-prometheus-305 branch August 8, 2025 15:23
mergify bot pushed a commit that referenced this pull request Aug 8, 2025
* 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
@khushijain21 khushijain21 added the backport-9.1 Automated backport to the 9.1 branch label Aug 13, 2025
mergify bot pushed a commit that referenced this pull request Aug 13, 2025
* 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:
#	go.mod
khushijain21 added a commit that referenced this pull request Aug 13, 2025
* Bump prometheus/prometheus to 0.305.0 (#45667)

* 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

* fix ci

---------

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
Co-authored-by: Khushi Jain <khushi.jain@elastic.co>
khushijain21 added a commit that referenced this pull request Aug 13, 2025
* Bump prometheus/prometheus to 0.305.0 (#45667)

* 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:
#	go.mod

* fix ci

---------

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
Co-authored-by: Khushi Jain <khushi.jain@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch 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.

5 participants