Skip to content

chore: bump github.com/prometheus/prometheus to v0.304.1#45159

Merged
andrzej-stencel merged 4 commits intoelastic:mainfrom
andrzej-stencel:bump-prometheus-v0.304.1
Jul 3, 2025
Merged

chore: bump github.com/prometheus/prometheus to v0.304.1#45159
andrzej-stencel merged 4 commits intoelastic:mainfrom
andrzej-stencel:bump-prometheus-v0.304.1

Conversation

@andrzej-stencel
Copy link
Copy Markdown
Contributor

@andrzej-stencel andrzej-stencel commented Jul 3, 2025

Proposed commit message

Update github.com/prometheus/prometheus to v0.304.1.

This is needed to update OTel Collector components to v0.129.0 in Elastic Agent repository, as the Prometheus receiver depends on github.com/prometheus/prometheus v0.304.1.

The one code change is a result of a breaking change introduced in prometheus/prometheus#16012.

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.

How to test this PR locally

(cd metricbeat && mage build)

@andrzej-stencel andrzej-stencel requested review from a team as code owners July 3, 2025 07:08
@andrzej-stencel andrzej-stencel added the release-note:skip The PR should be ignored when processing the changelog label Jul 3, 2025
@andrzej-stencel andrzej-stencel requested review from mauri870 and rdner July 3, 2025 07:08
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jul 3, 2025

🤖 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!)

@andrzej-stencel andrzej-stencel added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jul 3, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2025
@andrzej-stencel andrzej-stencel added needs_team Indicates that the issue/PR needs a Team:* label backport-8.19 Automated backport to the 8.19 branch labels Jul 3, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2025
@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jul 3, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b bump-prometheus-v0.304.1 upstream/bump-prometheus-v0.304.1
git merge upstream/main
git push upstream bump-prometheus-v0.304.1

@cmacknz cmacknz added the backport-9.1 Automated backport to the 9.1 branch label Jul 3, 2025
Copy link
Copy Markdown
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put this in 9.1 as well, since 8.19 and 9.1 should match right now. This seems safe to do at this point.

@mergify
Copy link
Copy Markdown
Contributor

mergify Bot commented Jul 3, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b bump-prometheus-v0.304.1 upstream/bump-prometheus-v0.304.1
git merge upstream/main
git push upstream bump-prometheus-v0.304.1

@andrzej-stencel andrzej-stencel enabled auto-merge (squash) July 3, 2025 15:10
@andrzej-stencel andrzej-stencel merged commit 621c6c3 into elastic:main Jul 3, 2025
202 checks passed
mergify Bot pushed a commit that referenced this pull request Jul 3, 2025
* [chore] bump github.com/prometheus/prometheus to v0.304.1

* make notice

(cherry picked from commit 621c6c3)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
mergify Bot pushed a commit that referenced this pull request Jul 3, 2025
* [chore] bump github.com/prometheus/prometheus to v0.304.1

* make notice

(cherry picked from commit 621c6c3)

# Conflicts:
#	go.mod
#	go.sum
@andrzej-stencel andrzej-stencel deleted the bump-prometheus-v0.304.1 branch July 4, 2025 07:56
andrzej-stencel added a commit that referenced this pull request Jul 7, 2025
…5179)

* [chore] bump github.com/prometheus/prometheus to v0.304.1

* make notice

(cherry picked from commit 621c6c3)

# Conflicts:
#	go.mod
#	go.sum

Co-authored-by: Andrzej Stencel <andrzej.stencel@elastic.co>
andrzej-stencel added a commit that referenced this pull request Jul 7, 2025
…5178)

* [chore] bump github.com/prometheus/prometheus to v0.304.1

* make notice

(cherry picked from commit 621c6c3)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum

Co-authored-by: Andrzej Stencel <andrzej.stencel@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 release-note:skip The PR should be ignored when processing the changelog 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.

4 participants