Skip to content
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

[libbeat] Temporarily vendor sarama from elastic's fork #14716

Merged
merged 6 commits into from
Nov 22, 2019

Conversation

faec
Copy link
Contributor

@faec faec commented Nov 22, 2019

Vendor http://github.com/Shopify/sarama from elastic's fork which includes the Azure fix elastic/sarama@355d120

This was created by:

govendor remove github.com/Shopify/sarama
govendor fetch github.com/Shopify/sarama/^::github.com/elastic/[email protected]
govendor remove github.com/DataDog/zstd

python dev-tools/generate_notice.py .

@faec faec requested a review from urso November 22, 2019 17:08
@jsoriano
Copy link
Member

jsoriano commented Nov 22, 2019

One thing, in 1.24.0 zstd support was replaced to use a pure-go implementation, and a regression was introduced (IBM/sarama#1252).

I think we don't support this compression algorithm, but we should take this into account in case we want to add support for it, maybe adding a comment in the list of supported algorithms in libbeat/outputs/kafka/config.go referencing the issue in Sarama.

And we could also remove github.com/DataDog/zstd from vendoring as it was only used by Sarama.

@faec
Copy link
Contributor Author

faec commented Nov 22, 2019

Good catch on zstd, though it looks like it's been broken for some time -- I added a note to the code (and removed the old library)

@faec faec added libbeat needs_backport PR is waiting to be backported to other branches. labels Nov 22, 2019
@faec faec merged commit f35ffdc into elastic:master Nov 22, 2019
@faec faec deleted the sarama-fix branch November 22, 2019 22:30
@faec faec added v7.5.0 and removed needs_backport PR is waiting to be backported to other branches. labels Nov 22, 2019
faec added a commit to faec/beats that referenced this pull request Nov 22, 2019
* remove mainline sarama

* Vendor sarama from github.com/elastic/[email protected]

* Update NOTICE.txt

* Add note about sarama zstd breakage

* remove github.com/DataDog/zstd from vendor dir as it's now unused

(cherry picked from commit f35ffdc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants