Change go module for v2 (#931)

Update go.mod of all the modules Update imports across files Ran go mod tidy which generated the go.sum files. Documentation update, needed to change the generate script as well for v2. Documentation changes in README.md Co-authored-by: Emanuele Sabellico <[email protected]>
confluentinc · Jan 23, 2023 · cde2827 · cde2827
1 parent ac2f9dc
commit cde2827
Show file tree

Hide file tree

Showing 77 changed files with 874 additions and 457 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Confluent's Golang client for Apache Kafka
 
-## v2.0.0
+## v2.0.2
 
 This is a feature release:
 
@@ -43,11 +43,14 @@ This is a feature release:
     (@HansK-p, @ju-popov, #878).
 
 
-confluent-kafka-go is based on librdkafka v2.0.0, see the
-[librdkafka release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.0.0)
+confluent-kafka-go is based on librdkafka v2.0.2, see the
+[librdkafka release notes](https://github.com/confluentinc/librdkafka/releases/tag/v2.0.2)
 for a complete list of changes, enhancements, fixes and upgrade considerations.
 
 
+**Note**: There were no confluent-kafka-go v2.0.0 or v2.0.1 releases.
+
+
 ## v1.9.2
 
 This is a maintenance release:

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {
@@ -85,7 +85,7 @@ Producer
 ```golang
 import (
 	"fmt"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {
@@ -133,7 +133,7 @@ for use with [Confluent Cloud](https://www.confluent.io/confluent-cloud/).
 Getting Started
 ===============
 
-Supports Go 1.14+ and librdkafka 2.0.0+.
+Supports Go 1.14+ and librdkafka 2.0.2+.
 
 Using Go Modules
 ----------------
@@ -144,7 +144,7 @@ confluent-kafka-go.
 Import the `kafka` package from GitHub in your code:
 
 ```golang
-import "github.com/confluentinc/confluent-kafka-go/kafka"
+import "github.com/confluentinc/confluent-kafka-go/v2/kafka"
 ```
 
 Build your project:
@@ -167,12 +167,12 @@ Install the client
 
 Manual install:
 ```bash
-go get -u github.com/confluentinc/confluent-kafka-go/kafka
+go get -u github.com/confluentinc/confluent-kafka-go/v2/kafka
 ```
 
 Golang import:
 ```golang
-import "github.com/confluentinc/confluent-kafka-go/kafka"
+import "github.com/confluentinc/confluent-kafka-go/v2/kafka"
 ```
 
 librdkafka

diff --git a/examples/admin_alter_consumer_group_offsets/admin_alter_consumer_group_offsets.go b/examples/admin_alter_consumer_group_offsets/admin_alter_consumer_group_offsets.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_create_acls/admin_create_acls.go b/examples/admin_create_acls/admin_create_acls.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 // Parses a list of 7n arguments to a slice of n ACLBinding

diff --git a/examples/admin_create_topic/admin_create_topic.go b/examples/admin_create_topic/admin_create_topic.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_delete_acls/admin_delete_acls.go b/examples/admin_delete_acls/admin_delete_acls.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 // Parses a list of 7n arguments to a slice of n ACLBindingFilter

diff --git a/examples/admin_delete_consumer_groups/admin_delete_consumer_groups.go b/examples/admin_delete_consumer_groups/admin_delete_consumer_groups.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_delete_topics/admin_delete_topics.go b/examples/admin_delete_topics/admin_delete_topics.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_describe_acls/admin_describe_acls.go b/examples/admin_describe_acls/admin_describe_acls.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 // Parses a list of 7n arguments to a slice of n ACLBindingFilter

diff --git a/examples/admin_describe_config/admin_describe_config.go b/examples/admin_describe_config/admin_describe_config.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_describe_consumer_groups/admin_describe_consumer_groups.go b/examples/admin_describe_consumer_groups/admin_describe_consumer_groups.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_list_consumer_group_offsets/admin_list_consumer_group_offsets.go b/examples/admin_list_consumer_group_offsets/admin_list_consumer_group_offsets.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/admin_list_consumer_groups/admin_list_consumer_groups.go b/examples/admin_list_consumer_groups/admin_list_consumer_groups.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/avro_generic_consumer_example/avro_generic_consumer_example.go b/examples/avro_generic_consumer_example/avro_generic_consumer_example.go
@@ -26,10 +26,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/avro"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avro"
 )
 
 func main() {

diff --git a/examples/avro_generic_producer_example/avro_generic_producer_example.go b/examples/avro_generic_producer_example/avro_generic_producer_example.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/avro"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avro"
 )
 
 func main() {

diff --git a/examples/avro_specific_consumer_example/avro_specific_consumer_example.go b/examples/avro_specific_consumer_example/avro_specific_consumer_example.go
@@ -26,10 +26,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/avro"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avro"
 )
 
 func main() {

diff --git a/examples/avro_specific_producer_example/avro_specific_producer_example.go b/examples/avro_specific_producer_example/avro_specific_producer_example.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/avro"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avro"
 )
 
 func main() {

diff --git a/examples/confluent_cloud_example/confluent_cloud_example.go b/examples/confluent_cloud_example/confluent_cloud_example.go
@@ -29,10 +29,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/avro"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avro"
 )
 
 // In order to set the constants below, you are going to need

diff --git a/examples/consumer_example/consumer_example.go b/examples/consumer_example/consumer_example.go
@@ -26,7 +26,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/consumer_offset_metadata/consumer_offset_metadata.go b/examples/consumer_offset_metadata/consumer_offset_metadata.go
@@ -26,7 +26,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/cooperative_consumer_example/cooperative_consumer_example.go b/examples/cooperative_consumer_example/cooperative_consumer_example.go
@@ -25,7 +25,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/docker_aws_lambda_example/producer_example.go b/examples/docker_aws_lambda_example/producer_example.go
@@ -26,7 +26,7 @@ import (
 	"os"
 
 	"github.com/aws/aws-lambda-go/lambda"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 var p *kafka.Producer

diff --git a/examples/go-kafkacat/go-kafkacat.go b/examples/go-kafkacat/go-kafkacat.go
@@ -26,7 +26,7 @@ import (
 	"syscall"
 
 	"github.com/alecthomas/kingpin"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 var (

diff --git a/examples/go.mod b/examples/go.mod
@@ -1,15 +1,15 @@
-module github.com/confluentinc/confluent-kafka-go/examples
+module github.com/confluentinc/confluent-kafka-go/examples/v2
 
-go 1.13
+go 1.14
 
-replace github.com/confluentinc/confluent-kafka-go => ../
+replace github.com/confluentinc/confluent-kafka-go/v2 => ../
 
 require (
 	github.com/actgardner/gogen-avro/v10 v10.2.1
 	github.com/alecthomas/kingpin v2.2.6+incompatible
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/confluentinc/confluent-kafka-go v1.9.2
+	github.com/confluentinc/confluent-kafka-go/v2 v2.0.2-00010101000000-000000000000
 	github.com/gdamore/tcell v1.4.0
 	google.golang.org/protobuf v1.28.0
 )
diff --git a/examples/go.sum b/examples/go.sum
@@ -167,7 +167,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/examples/idempotent_producer_example/idempotent_producer_example.go b/examples/idempotent_producer_example/idempotent_producer_example.go
@@ -32,7 +32,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 var run = true

diff --git a/examples/json_consumer_example/json_consumer_example.go b/examples/json_consumer_example/json_consumer_example.go
@@ -26,10 +26,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/jsonschema"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/jsonschema"
 )
 
 func main() {

diff --git a/examples/json_producer_example/json_producer_example.go b/examples/json_producer_example/json_producer_example.go
@@ -21,10 +21,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde"
-	"github.com/confluentinc/confluent-kafka-go/schemaregistry/serde/jsonschema"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
+	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/jsonschema"
 )
 
 func main() {

diff --git a/examples/legacy/consumer_channel_example/consumer_channel_example.go b/examples/legacy/consumer_channel_example/consumer_channel_example.go
@@ -23,7 +23,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/legacy/producer_channel_example/producer_channel_example.go b/examples/legacy/producer_channel_example/producer_channel_example.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/library-version/library-version.go b/examples/library-version/library-version.go
@@ -22,7 +22,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {

diff --git a/examples/mockcluster_example/mockcluster.go b/examples/mockcluster_example/mockcluster.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/confluentinc/confluent-kafka-go/kafka"
+	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 )
 
 func main() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/confluentinc/confluent-kafka-go/kafka"
+    	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
     )
     // Parses a list of 7n arguments to a slice of n ACLBinding
@@ Expand Down @@