Update elastic-agent-client and rename control proto package to cproto #39586
Conversation
This file contains 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
michel-laterman
added
bug
Team:Elastic-Agent-Control-Plane
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
botelastic
bot
added
needs_team
michel-laterman
added
backport
needs_team
botelastic
bot
removed
the
needs_team
cmacknz
reviewed
May 16, 2024
|
|
||
| option cc_enable_arenas = true; | ||
| option go_package = "pkg/agent/control/proto;proto"; | ||
| option go_package = "pkg/agent/control/cproto;cproto"; |
There was a problem hiding this comment.
Can you still upgrade 7.17.x->7.17.x with this change?
In the 8.x agent we maintain two copies of the file but I can't remember if the concern there applies here as well. https://github.com/elastic/elastic-agent/blob/fd0d1bb164dd5dbd0f64c7a2d0e727cf7b13e777/control_v1.proto#L7-L11
…astic#39224) * Update elastic-agent-client used in 7.17 releases
Rename control proto package to cproto so it does not conflict with elastic-agent-client import
michel-laterman
force-pushed
the
client-update-fix
branch
from
0430043
to
0902e38
Compare
michel-laterman
changed the title
michel-laterman
force-pushed
the
client-update-fix
branch
from
39ce18b
to
c4ecb92
Compare
belimawr
reviewed
May 22, 2024
|
I was able to upgrade successfully from 7.17.21-SNAPSHOT to 7.17.22-SNAPSHOT on a standalone install. |
belimawr
approved these changes
May 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed commit message
cherry-pick the commit to update the elastic-agent-client to a more recent version. The PR was reverted because the resulting binary failed to start due to a proto namespace collision.
Rename control proto package to cproto so it does not conflict with elastic-agent-client import
Upgrade integration test found that we had an error when upgrading from the latest 7.17.x snapshots.
Investigation found that while the binary could compile and all tests pass, attempting to run it would cause a panic when the imports executed their
initfunctions as the protobuf namespaces collided.Checklist
I have commented my code, particularly in hard-to-understand areasI have made corresponding changes to the documentationCHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.How to test this PR locally
compile the agent binary and attempt to run any command, i.e.,
elastic-agent versionRelated issues