diff --git a/examples/xkafka/go.mod b/examples/xkafka/go.mod index a9cee3b..22a8a4a 100644 --- a/examples/xkafka/go.mod +++ b/examples/xkafka/go.mod @@ -26,7 +26,7 @@ require ( github.com/cockroachdb/errors v1.9.0 // indirect github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect + github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 // indirect github.com/getsentry/sentry-go v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/examples/xkafka/go.sum b/examples/xkafka/go.sum index 9d5096b..5c77cfd 100644 --- a/examples/xkafka/go.sum +++ b/examples/xkafka/go.sum @@ -84,8 +84,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+QUM+wVkI9zwh770Q= -github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 h1:YmUjjRp1mSTqTxtHQYMQKBLa2hfgIZz9PSqoSRDkwf4= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2/go.mod h1:qWGwym8EpAsIP5lZsTKhYTnYSGqkbxEfRB4A489Jo64= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/xkafka/alias.go b/xkafka/alias.go index 49aec55..c8ee418 100644 --- a/xkafka/alias.go +++ b/xkafka/alias.go @@ -1,6 +1,6 @@ package xkafka -import "github.com/confluentinc/confluent-kafka-go/kafka" +import "github.com/confluentinc/confluent-kafka-go/v2/kafka" // Metadata contains broker and topic metadata for all (matching) topics type Metadata = kafka.Metadata diff --git a/xkafka/confluent.go b/xkafka/confluent.go index 9e9e844..dd13184 100644 --- a/xkafka/confluent.go +++ b/xkafka/confluent.go @@ -3,7 +3,7 @@ package xkafka import ( "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" ) type consumerClient interface { diff --git a/xkafka/consumer.go b/xkafka/consumer.go index 3a207fe..078f870 100644 --- a/xkafka/consumer.go +++ b/xkafka/consumer.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" "github.com/pkg/errors" "github.com/sourcegraph/conc/stream" ) diff --git a/xkafka/consumer_mock_test.go b/xkafka/consumer_mock_test.go index edf29d7..04161fc 100644 --- a/xkafka/consumer_mock_test.go +++ b/xkafka/consumer_mock_test.go @@ -5,7 +5,7 @@ package xkafka import ( time "time" - kafka "github.com/confluentinc/confluent-kafka-go/kafka" + kafka "github.com/confluentinc/confluent-kafka-go/v2/kafka" mock "github.com/stretchr/testify/mock" ) diff --git a/xkafka/consumer_test.go b/xkafka/consumer_test.go index 06122b6..d9d2a4f 100644 --- a/xkafka/consumer_test.go +++ b/xkafka/consumer_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/xkafka/go.mod b/xkafka/go.mod index 79b3b09..236ab18 100644 --- a/xkafka/go.mod +++ b/xkafka/go.mod @@ -3,7 +3,7 @@ module github.com/gojekfarm/xtools/xkafka go 1.19 require ( - github.com/confluentinc/confluent-kafka-go v1.9.2 + github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 github.com/pkg/errors v0.9.1 github.com/sourcegraph/conc v0.2.0 github.com/stretchr/testify v1.8.1 diff --git a/xkafka/go.sum b/xkafka/go.sum index 913f16c..a15ae2b 100644 --- a/xkafka/go.sum +++ b/xkafka/go.sum @@ -41,8 +41,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+QUM+wVkI9zwh770Q= -github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 h1:YmUjjRp1mSTqTxtHQYMQKBLa2hfgIZz9PSqoSRDkwf4= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2/go.mod h1:qWGwym8EpAsIP5lZsTKhYTnYSGqkbxEfRB4A489Jo64= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/xkafka/message.go b/xkafka/message.go index 70b13b5..4ccef42 100644 --- a/xkafka/message.go +++ b/xkafka/message.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" ) // AckFunc are callback funtions triggered for every ack. diff --git a/xkafka/message_test.go b/xkafka/message_test.go index 50e1976..e0ea4ee 100644 --- a/xkafka/message_test.go +++ b/xkafka/message_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" "github.com/stretchr/testify/assert" ) diff --git a/xkafka/middleware/go.mod b/xkafka/middleware/go.mod index 94be03f..ed05ce8 100644 --- a/xkafka/middleware/go.mod +++ b/xkafka/middleware/go.mod @@ -13,7 +13,7 @@ require ( github.com/cockroachdb/errors v1.9.0 // indirect github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect + github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/getsentry/sentry-go v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect diff --git a/xkafka/middleware/go.sum b/xkafka/middleware/go.sum index 913f16c..a15ae2b 100644 --- a/xkafka/middleware/go.sum +++ b/xkafka/middleware/go.sum @@ -41,8 +41,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+QUM+wVkI9zwh770Q= -github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 h1:YmUjjRp1mSTqTxtHQYMQKBLa2hfgIZz9PSqoSRDkwf4= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2/go.mod h1:qWGwym8EpAsIP5lZsTKhYTnYSGqkbxEfRB4A489Jo64= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/xkafka/middleware/prometheus/go.mod b/xkafka/middleware/prometheus/go.mod index 9a11457..7064da0 100644 --- a/xkafka/middleware/prometheus/go.mod +++ b/xkafka/middleware/prometheus/go.mod @@ -16,7 +16,7 @@ require ( github.com/cockroachdb/errors v1.9.0 // indirect github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect + github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/getsentry/sentry-go v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect diff --git a/xkafka/middleware/prometheus/go.sum b/xkafka/middleware/prometheus/go.sum index f40fb6a..584109f 100644 --- a/xkafka/middleware/prometheus/go.sum +++ b/xkafka/middleware/prometheus/go.sum @@ -84,8 +84,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+QUM+wVkI9zwh770Q= -github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 h1:YmUjjRp1mSTqTxtHQYMQKBLa2hfgIZz9PSqoSRDkwf4= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2/go.mod h1:qWGwym8EpAsIP5lZsTKhYTnYSGqkbxEfRB4A489Jo64= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/xkafka/middleware/zerolog/go.mod b/xkafka/middleware/zerolog/go.mod index 33f5c5e..26d95c3 100644 --- a/xkafka/middleware/zerolog/go.mod +++ b/xkafka/middleware/zerolog/go.mod @@ -13,7 +13,7 @@ require ( github.com/cockroachdb/errors v1.9.0 // indirect github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect github.com/cockroachdb/redact v1.1.3 // indirect - github.com/confluentinc/confluent-kafka-go v1.9.2 // indirect + github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 // indirect github.com/getsentry/sentry-go v0.13.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/kr/pretty v0.3.0 // indirect diff --git a/xkafka/middleware/zerolog/go.sum b/xkafka/middleware/zerolog/go.sum index 2551889..1d30730 100644 --- a/xkafka/middleware/zerolog/go.sum +++ b/xkafka/middleware/zerolog/go.sum @@ -41,8 +41,8 @@ github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5w github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= -github.com/confluentinc/confluent-kafka-go v1.9.2 h1:gV/GxhMBUb03tFWkN+7kdhg+zf+QUM+wVkI9zwh770Q= -github.com/confluentinc/confluent-kafka-go v1.9.2/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2 h1:YmUjjRp1mSTqTxtHQYMQKBLa2hfgIZz9PSqoSRDkwf4= +github.com/confluentinc/confluent-kafka-go/v2 v2.0.2/go.mod h1:qWGwym8EpAsIP5lZsTKhYTnYSGqkbxEfRB4A489Jo64= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/xkafka/options.go b/xkafka/options.go index 0f68ef6..6daab38 100644 --- a/xkafka/options.go +++ b/xkafka/options.go @@ -3,7 +3,7 @@ package xkafka import ( "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" ) const ( diff --git a/xkafka/producer.go b/xkafka/producer.go index b2c98ce..d2c6f05 100644 --- a/xkafka/producer.go +++ b/xkafka/producer.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" "github.com/pkg/errors" ) diff --git a/xkafka/producer_mock_test.go b/xkafka/producer_mock_test.go index f317019..681b256 100644 --- a/xkafka/producer_mock_test.go +++ b/xkafka/producer_mock_test.go @@ -3,7 +3,7 @@ package xkafka import ( - kafka "github.com/confluentinc/confluent-kafka-go/kafka" + kafka "github.com/confluentinc/confluent-kafka-go/v2/kafka" mock "github.com/stretchr/testify/mock" ) diff --git a/xkafka/producer_test.go b/xkafka/producer_test.go index 9f54014..acb79cd 100644 --- a/xkafka/producer_test.go +++ b/xkafka/producer_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/confluentinc/confluent-kafka-go/v2/kafka" "github.com/stretchr/testify/assert" mock "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require"