-
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
Open
khushijain21
wants to merge
29
commits into
elastic:main
Choose a base branch
from
khushijain21:kafka
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+215
−263
Open
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
5364073
resolve conflict
khushijain21 cc3530e
Merge branch 'main' into kafka
khushijain21 291d008
point to elastic sarama fork directly
khushijain21 bcfbf51
remove dependency on shopify
khushijain21 37e83bb
linting issues
khushijain21 e1579e6
linint issues 2
khushijain21 e1396ac
Merge branch 'main' into kafka
khushijain21 05989d1
fixed wrapped errors lining
khushijain21 7b68d68
CI failures
khushijain21 550613a
ignore error messages in integration tests
khushijain21 85c0cd7
import paths
khushijain21 12d7be5
correct elastic import path
khushijain21 8b3a6b5
import path
khushijain21 76b93ad
add next valid versions
khushijain21 610d4d1
revert
khushijain21 7b94368
revert
khushijain21 9a446c8
revert
khushijain21 55552b8
fix failing intergation tests
khushijain21 93b7c07
fix failing test
khushijain21 b257dc7
Merge remote-tracking branch 'upstream/main' into kafka
khushijain21 3c6ea31
upgrade kafka version for testing
khushijain21 fc94087
using 2.2.2 kafka version
khushijain21 7db64c9
startConsumergroup
khushijain21 e7deb67
consumergroup
khushijain21 ba7e70c
add IBM/sarama methods for consumerinteg
khushijain21 b812afe
Merge remote-tracking branch 'upstream/main' into kafka
khushijain21 675a960
linter errors
khushijain21 2377aed
consumer group with IBM/sarama
khushijain21 c629f29
Merge remote-tracking branch 'upstream/main' into kafka
khushijain21 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2646,6 +2646,40 @@ Contents of probable licence file $GOMODCACHE/github.com/!azure/go-autorest/auto | |
| limitations under the License. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/sarama | ||
| Version: v1.19.1-0.20241118045140-603e70e982ce | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE.md: | ||
|
|
||
| # MIT License | ||
|
|
||
| Copyright (c) 2013 Shopify | ||
|
|
||
| Copyright (c) 2023 IBM Corporation | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/Microsoft/go-winio | ||
| Version: v0.6.2 | ||
|
|
@@ -2745,36 +2779,6 @@ OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | |
| CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/elastic/sarama | ||
| Version: v1.19.1-0.20220310193331-ebc2b0d8eef3 | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]/LICENSE: | ||
|
|
||
| Copyright (c) 2013 Shopify | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/StackExchange/wmi | ||
| Version: v1.2.1 | ||
|
|
@@ -12880,11 +12884,11 @@ SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/eapache/go-resiliency | ||
| Version: v1.2.0 | ||
| Version: v1.7.0 | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.2.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/eapache/go-resiliency@v1.7.0/LICENSE: | ||
|
|
||
| The MIT License (MIT) | ||
|
|
||
|
|
@@ -21905,11 +21909,11 @@ THE SOFTWARE. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/pierrec/lz4/v4 | ||
| Version: v4.1.18 | ||
| Version: v4.1.21 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/[email protected].18/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/[email protected].21/LICENSE: | ||
|
|
||
| Copyright (c) 2015, Pierre Curto | ||
| All rights reserved. | ||
|
|
@@ -32858,6 +32862,36 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
| THE SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/Shopify/sarama | ||
| Version: v1.27.0 | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/!shopify/[email protected]/LICENSE: | ||
|
|
||
| Copyright (c) 2013 Shopify | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining | ||
| a copy of this software and associated documentation files (the | ||
| "Software"), to deal in the Software without restriction, including | ||
| without limitation the rights to use, copy, modify, merge, publish, | ||
| distribute, sublicense, and/or sell copies of the Software, and to | ||
| permit persons to whom the Software is furnished to do so, subject to | ||
| the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be | ||
| included in all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
|
|
||
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/Shopify/toxiproxy | ||
| Version: v2.1.4+incompatible | ||
|
|
@@ -39130,11 +39164,11 @@ Contents of probable licence file $GOMODCACHE/github.com/docker/[email protected]. | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/eapache/go-xerial-snappy | ||
| Version: v0.0.0-20180814174437-776d5712da21 | ||
| Version: v0.0.0-20230731223053-c322873962e3 | ||
| Licence type (autodetected): MIT | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/eapache/[email protected]20180814174437-776d5712da21/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/eapache/[email protected]20230731223053-c322873962e3/LICENSE: | ||
|
|
||
| The MIT License (MIT) | ||
|
|
||
|
|
@@ -45873,11 +45907,13 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/hashicorp/go-uuid | ||
| Version: v1.0.2 | ||
| Version: v1.0.3 | ||
| Licence type (autodetected): MPL-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/hashicorp/[email protected]/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/hashicorp/[email protected]/LICENSE: | ||
|
|
||
| Copyright © 2015-2022 HashiCorp, Inc. | ||
|
|
||
| Mozilla Public License, version 2.0 | ||
|
|
||
|
|
@@ -47312,11 +47348,11 @@ Contents of probable licence file $GOMODCACHE/github.com/jcmturner/dnsutils/v2@v | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/jcmturner/gofork | ||
| Version: v1.0.0 | ||
| Version: v1.7.6 | ||
| Licence type (autodetected): BSD-3-Clause | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/jcmturner/gofork@v1.0.0/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/jcmturner/gofork@v1.7.6/LICENSE: | ||
|
|
||
| Copyright (c) 2009 The Go Authors. All rights reserved. | ||
|
|
||
|
|
@@ -47560,11 +47596,11 @@ Contents of probable licence file $GOMODCACHE/github.com/jcmturner/goidentity/v6 | |
|
|
||
| -------------------------------------------------------------------------------- | ||
| Dependency : github.com/jcmturner/gokrb5/v8 | ||
| Version: v8.4.2 | ||
| Version: v8.4.4 | ||
| Licence type (autodetected): Apache-2.0 | ||
| -------------------------------------------------------------------------------- | ||
|
|
||
| Contents of probable licence file $GOMODCACHE/github.com/jcmturner/gokrb5/[email protected].2/LICENSE: | ||
| Contents of probable licence file $GOMODCACHE/github.com/jcmturner/gokrb5/[email protected].4/LICENSE: | ||
|
|
||
| Apache License | ||
| Version 2.0, January 2004 | ||
|
|
||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
Where is the indirect dependency coming from here? (Do we pick up both versions in the actual build?)
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.
The output of
go mod why github.com/Shopify/saramasays:# github.com/Shopify/sarama github.com/elastic/beats/v7/metricbeat/module/kafka/consumergroup github.com/elastic/beats/v7/metricbeat/module/kafka/consumergroup.test github.com/bsm/sarama-cluster github.com/Shopify/saramaThe
sarama-clusterpackage is only used in a single integration test.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.
If I remember correctly sarama cluster used to be necessary before sarama properly supported consumer groups, which has been the case for a long time, so we can get rid of this. It says as much in https://github.com/bsm/sarama-cluster where the repository is archived for this reason.