Skip to content

[9.1](backport #45159) chore: bump github.com/prometheus/prometheus to v0.304.1#45179

Merged
andrzej-stencel merged 2 commits into9.1from
mergify/bp/9.1/pr-45159
Jul 7, 2025
Merged

[9.1](backport #45159) chore: bump github.com/prometheus/prometheus to v0.304.1#45179
andrzej-stencel merged 2 commits into9.1from
mergify/bp/9.1/pr-45159

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot 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)
```<hr>This is an automatic backport of pull request #45159 done by [Mergify](https://mergify.com).

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

* make notice

(cherry picked from commit 621c6c3)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 3, 2025
@mergify mergify Bot requested review from a team as code owners July 3, 2025 16:53
@mergify mergify Bot added the backport label Jul 3, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 3, 2025

Cherry-pick of 621c6c3 has failed:

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

You are currently cherry-picking commit 621c6c3ea.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

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 removed the request for review from a team July 3, 2025 16:53
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 3, 2025
@mergify mergify Bot requested review from VihasMakwana and andrzej-stencel July 3, 2025 16:53
@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!)

@github-actions github-actions Bot added release-note:skip The PR should be ignored when processing the changelog Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Jul 3, 2025
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 3, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 4, 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 mergify/bp/9.1/pr-45159 upstream/mergify/bp/9.1/pr-45159
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-45159

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 7, 2025

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

@andrzej-stencel andrzej-stencel merged commit a93e2c6 into 9.1 Jul 7, 2025
202 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/9.1/pr-45159 branch July 7, 2025 07:28
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 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.

3 participants