diff --git a/docs/LICENSE_OF_DEPENDENCIES.md b/docs/LICENSE_OF_DEPENDENCIES.md index 9d6a9de4b..254e0c492 100644 --- a/docs/LICENSE_OF_DEPENDENCIES.md +++ b/docs/LICENSE_OF_DEPENDENCIES.md @@ -27,6 +27,7 @@ following works: - github.com/AzureAD/microsoft-authentication-library-for-go [MIT License](https://github.com/AzureAD/microsoft-authentication-library-for-go/blob/main/LICENSE) - github.com/ClickHouse/clickhouse-go [MIT License](https://github.com/ClickHouse/clickhouse-go/blob/master/LICENSE) - github.com/IBM/nzgo [MIT License](https://github.com/IBM/nzgo/blob/master/LICENSE.md) +- github.com/IBM/sarama [MIT License](https://github.com/IBM/sarama/blob/master/LICENSE.md) - github.com/JohnCGriffin/overflow [MIT License](https://github.com/JohnCGriffin/overflow/blob/master/README.md) - github.com/Masterminds/goutils [Apache License 2.0](https://github.com/Masterminds/goutils/blob/master/LICENSE.txt) - github.com/Masterminds/semver [MIT License](https://github.com/Masterminds/semver/blob/master/LICENSE.txt) diff --git a/go.mod b/go.mod index 62d93422d..7d856d1c1 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/ClickHouse/clickhouse-go v1.5.4 github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/IBM/nzgo/v12 v12.0.9-0.20231115043259-49c27f2dfe48 + github.com/IBM/sarama v1.41.3 github.com/Masterminds/sprig v2.22.0+incompatible github.com/Masterminds/sprig/v3 v3.2.3 github.com/Mellanox/rdmamap v1.1.0 diff --git a/plugins/common/kafka/config.go b/plugins/common/kafka/config.go index f007d24ec..cd3fd432a 100644 --- a/plugins/common/kafka/config.go +++ b/plugins/common/kafka/config.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/influxdata/telegraf" tgConf "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/common/tls" diff --git a/plugins/common/kafka/logger.go b/plugins/common/kafka/logger.go index ad264c31e..dd0a65a18 100644 --- a/plugins/common/kafka/logger.go +++ b/plugins/common/kafka/logger.go @@ -1,7 +1,7 @@ package kafka import ( - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/models" diff --git a/plugins/common/kafka/sasl.go b/plugins/common/kafka/sasl.go index 029a18c1f..4a7356aa8 100644 --- a/plugins/common/kafka/sasl.go +++ b/plugins/common/kafka/sasl.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/influxdata/telegraf/config" ) diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go index 3d3e1d963..6262fb6d8 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/config" @@ -137,11 +137,11 @@ func (k *KafkaConsumer) Init() error { switch strings.ToLower(k.BalanceStrategy) { case "range", "": - cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRange} + cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRange()} case "roundrobin": - cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategyRoundRobin} + cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategyRoundRobin()} case "sticky": - cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.BalanceStrategySticky} + cfg.Consumer.Group.Rebalance.GroupStrategies = []sarama.BalanceStrategy{sarama.NewBalanceStrategySticky()} default: return fmt.Errorf("invalid balance strategy %q", k.BalanceStrategy) } diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go index 2f45b4f41..5bb46f1e5 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" kafkacontainer "github.com/testcontainers/testcontainers-go/modules/kafka" diff --git a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go index 1cc05f0ef..372f25d0c 100644 --- a/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go +++ b/plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_integration_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/stretchr/testify/require" "github.com/influxdata/telegraf/plugins/parsers/influx" diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go index e772ada98..184ed3b80 100644 --- a/plugins/outputs/kafka/kafka.go +++ b/plugins/outputs/kafka/kafka.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/gofrs/uuid/v5" "github.com/influxdata/telegraf" diff --git a/plugins/outputs/kafka/kafka_test.go b/plugins/outputs/kafka/kafka_test.go index 5a23aeefd..5e28256c4 100644 --- a/plugins/outputs/kafka/kafka_test.go +++ b/plugins/outputs/kafka/kafka_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/Shopify/sarama" + "github.com/IBM/sarama" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" kafkacontainer "github.com/testcontainers/testcontainers-go/modules/kafka"