Support replace directives in otel readme mage command#7456
Merged
Conversation
swiatekm
added
Team:Elastic-Agent-Control-Plane
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
cmacknz
reviewed
Mar 20, 2025
3 tasks
swiatekm
force-pushed
the
chore/otel-readme-revision
branch
from
f33092c to
68db892
Compare
andrzej-stencel
approved these changes
Mar 27, 2025
|
Contributor
💔 Build Failed
Failed CI Steps
History
cc @swiatekm |
mergify bot
pushed a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod
3 tasks
mergify bot
pushed a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod # magefile.go
mergify bot
pushed a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # NOTICE.txt # go.mod
This was referenced Mar 28, 2025
mergify bot
pushed a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # NOTICE.txt # go.mod # magefile.go
3 tasks
mergify bot
pushed a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod
3 tasks
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # NOTICE.txt # go.mod
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # NOTICE.txt # go.mod
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # NOTICE.txt # go.mod Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm
added a commit
that referenced
this pull request
Mar 28, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod # magefile.go
ycombinator
pushed a commit
that referenced
this pull request
Apr 4, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254)
swiatekm
added a commit
that referenced
this pull request
Apr 7, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod # magefile.go
ycombinator
pushed a commit
that referenced
this pull request
Apr 7, 2025
* Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) # Conflicts: # go.mod # magefile.go Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
ycombinator
added a commit
that referenced
this pull request
Apr 15, 2025
…command (#7612) * Support replace directives in otel readme mage command (#7456) * Support pseudo-versions in otel readme mage command * Move otel dependency handling to a separate package (cherry picked from commit 9071254) * Undoing irrelevant changes * Running mage update --------- Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com> Co-authored-by: Shaunak Kashyap <ycombinator@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Makes the
otel:readmemage 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