Skip to content

[9.0](backport #7456) Support replace directives in otel readme mage command#7612

Merged
ycombinator merged 3 commits into9.0from
mergify/bp/9.0/pr-7456
Apr 15, 2025
Merged

[9.0](backport #7456) Support replace directives in otel readme mage command#7612
ycombinator merged 3 commits into9.0from
mergify/bp/9.0/pr-7456

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

What does this PR do?

Makes the otel:readme mage command support replace directives. It now also supports pseudo-versions that Go uses for commit hashes in go.mod.

The implementation now actually parses the go.mod file using x/mod.

Why is it important?

In order to resolve a dependency conflict between beats and otel 0.120.x, we're going to use our own fork of prometheusreceiver. See #7443 for this change made in the 8.18 branch.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas

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

@mergify mergify bot requested a review from a team as a code owner March 28, 2025 12:45
@mergify mergify bot requested review from kaanyalti and ycombinator and removed request for a team March 28, 2025 12:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 28, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 9071254 has failed:

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

You are currently cherry-picking commit 907125402.
  (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
	new file:   dev-tools/mage/otel/deps.go
	new file:   dev-tools/mage/otel/deps_test.go
	modified:   magefile.go

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

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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements labels Mar 28, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mergify
Copy link
Contributor Author

mergify bot commented Mar 31, 2025

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

@mergify
Copy link
Contributor Author

mergify bot commented Apr 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.0/pr-7456 upstream/mergify/bp/9.0/pr-7456
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-7456

* Support pseudo-versions in otel readme mage command

* Move otel dependency handling to a separate package

(cherry picked from commit 9071254)
@ycombinator ycombinator force-pushed the mergify/bp/9.0/pr-7456 branch from 42daa72 to 889a759 Compare April 4, 2025 16:27
@ycombinator ycombinator enabled auto-merge (squash) April 4, 2025 16:29
ycombinator
ycombinator previously approved these changes Apr 4, 2025
@ycombinator
Copy link
Contributor

@swiatekm CI was failing because it wanted prometheusreceiver out of the OTel README. So I ran mage update to fix that. But I'll defer to you on whether that's appropriate or not, considering that the original PR didn't include this removal.

@elastic-sonarqube
Copy link

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @swiatekm

@mergify
Copy link
Contributor Author

mergify bot commented Apr 7, 2025

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

@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2025

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

@ycombinator ycombinator disabled auto-merge April 15, 2025 19:36
@ycombinator ycombinator merged commit 34a7e7f into 9.0 Apr 15, 2025
12 checks passed
@ycombinator ycombinator deleted the mergify/bp/9.0/pr-7456 branch April 15, 2025 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport chore Tasks that just need to be done, they are neither bug, nor enhancements conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants