-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Beats to the current Sarama fork #41655
Conversation
This pull request is now in conflicts. Could you fix it? 🙏
|
This pull request does not have a backport label.
To fixup this pull request, you need to add the backport labels for the needed
|
|
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
qq: Why don't we directly point to the fork i.e., github.com/elastic/sarama@beats-fork? Asking this because we have faced some problem with this before. See the PR description: #39840 (comment). As it was breaking for the apm team, upon investigation, I found the problem and that's why we moved to using the fork directly. If required, I can also send the related Slack conversation in Slack. So basically what'd happen is anyone using beats as a dependency, the replace directive won't work for them. |
I think we can. @faec could you please confirm? Any particular reason we don't directly use the fork |
I don't see a reason we can't, but the reason we don't is probably that we would prefer to revert to upstream someday. Though there admittedly has not been much movement on that, so I don't think that's an overriding concern if it simplifies dependency handling overall. |
As a side note, you can automate changes in import paths using gofmt -w -r '"github.com/Shopify/sarama" -> "github.com/IBM/sarama"' . |
This pull request is now in conflicts. Could you fix it? 🙏
|
@@ -6,7 +6,8 @@ ENV TC apache-tomcat-${TOMCAT_VERSION} | |||
ARG JOLOKIA_VERSION | |||
|
|||
RUN apk update && \ | |||
apk add curl openssl ca-certificates bash | |||
apk upgrade --no-cache && \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It uses an old version of curl
which fails when you build locally. So this explicit upgrade was required
This pull request is now in conflicts. Could you fix it? 🙏
|
I think we should also update the kafka application version in our integration tests. I plan to do this in a separate PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
This pull request does not have a backport label.
To fixup this pull request, you need to add the backport labels for the needed
|
|
- Update Beats to the current sarama fork (cherry picked from commit 4942592)
This PR updates Beats to the current version of Elastic's Sarama fork. It upgrades sarama version to 1.43.3.
The import path has been changed from
github.com/Shopify/sarama
github.com/elastic/sarama
due to change in ownership.