Updated to v2

zillow · Oct 17, 2024 · 11a708a · 11a708a
1 parent cbbaa0e
commit 11a708a
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 # zkafka
 
-[![License](https://img.shields.io/github/license/zillow/zkafka)](https://github.com/zillow/zkafka/blob/main/LICENSE)
-[![GitHub Actions](https://github.com/zillow/zkafka/actions/workflows/go.yml/badge.svg)](https://github.com/zillow/zkafka/actions/workflows/go.yml)
+[![License](https://img.shields.io/github/license/zillow/zkafka)](https://github.com/zillow/zkafka/v2/blob/main/LICENSE)
+[![GitHub Actions](https://github.com/zillow/zkafka/v2/actions/workflows/go.yml/badge.svg)](https://github.com/zillow/zkafka/v2/actions/workflows/go.yml)
 [![Codecov](https://codecov.io/gh/zillow/zkafka/branch/main/graph/badge.svg?token=STRT8T67YP)](https://codecov.io/gh/zillow/zkafka)
-[![Go Report Card](https://goreportcard.com/badge/github.com/zillow/zkafka)](https://goreportcard.com/report/github.com/zillow/zkafka)
+[![Go Report Card](https://goreportcard.com/badge/github.com/zillow/zkafka/v2)](https://goreportcard.com/report/github.com/zillow/zkafka/v2)
 
 ## Install
 
-`go get -u github.com/zillow/zkafka`
+`go get -u github.com/zillow/zkafka/v2`
 
 ## About
 

diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to Semantic Versioning.
 
+## 2.0.0 (October 17, 2024)
+
+1. Removed dependency on github.com/golang/mock (deprecated) in favor of github.com/uber-go/mock 
+
 ## 1.3.0 (Sep 25, 2024)
 
 1. Added `WithDisableCircuitBreaker` and `WithDisableBusyLoopBreaker` options. These are variants of the now deprecated `DisableCircuitBreaker`

diff --git a/client.go b/client.go
@@ -22,7 +22,7 @@ type ClientProvider interface {
 // static type checking for the convenient Writer interface
 var _ ClientProvider = (*Client)(nil)
 
-const instrumentationName = "github.com/zillow/zkafka"
+const instrumentationName = "github.com/zillow/zkafka/v2"
 
 // Client helps instantiate usable readers and writers
 type Client struct {

diff --git a/client_test.go b/client_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	mock_confluent "github.com/zillow/zkafka/mocks/confluent"
+	mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"

diff --git a/example/producer/main.go b/example/producer/main.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 func main() {

diff --git a/example/producer_avro/go.mod b/example/producer_avro/go.mod
@@ -1,10 +1,10 @@
-module github.com/zillow/zkafka/example/producer_avro
+module github.com/zillow/zkafka/v2/example/producer_avro
 
 go 1.23.1
 
-replace github.com/zillow/zkafka v1.0.0 => ../..
+replace github.com/zillow/zkafka/v2 v1.0.0 => ../..
 
-require github.com/zillow/zkafka v1.0.0
+require github.com/zillow/zkafka/v2 v1.0.0
 
 require (
 	github.com/actgardner/gogen-avro/v10 v10.2.1 // indirect

diff --git a/example/producer_avro/main.go b/example/producer_avro/main.go
@@ -7,7 +7,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 //go:embed event.avsc

diff --git a/example/worker-deadletter/main.go b/example/worker-deadletter/main.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 // Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

diff --git a/example/worker-delay/main.go b/example/worker-delay/main.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 // Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

diff --git a/example/worker/main.go b/example/worker/main.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 // Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

diff --git a/example/worker_avro/go.mod b/example/worker_avro/go.mod
@@ -1,12 +1,12 @@
-module github.com/zillow/zkafka/example/worker_avro
+module github.com/zillow/zkafka/v2/example/worker_avro
 
 go 1.23.1
 
-replace github.com/zillow/zkafka v1.0.0 => ../..
+replace github.com/zillow/zkafka/v2 v1.0.0 => ../..
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/zillow/zkafka v1.0.0
+	github.com/zillow/zkafka/v2 v1.0.0
 )
 
 require (

diff --git a/example/worker_avro/main.go b/example/worker_avro/main.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 //go:embed event.avsc

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/zillow/zkafka
+module github.com/zillow/zkafka/v2
 
 go 1.23
 

diff --git a/mocks/confluent/kafka_consumer.go b/mocks/confluent/kafka_consumer.go
diff --git a/mocks/confluent/kafka_producer.go b/mocks/confluent/kafka_producer.go
diff --git a/mocks/kreader.go b/mocks/kreader.go
@@ -5,7 +5,7 @@ package mock_zkafka
 import (
 	"context"
 
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 var (

diff --git a/mocks/kwriter.go b/mocks/kwriter.go
@@ -5,7 +5,7 @@ package mock_zkafka
 import (
 	"context"
 
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 )
 
 var (

diff --git a/mocks/mock_client.go b/mocks/mock_client.go
diff --git a/mocks/mock_reader.go b/mocks/mock_reader.go
diff --git a/mocks/mock_writer.go b/mocks/mock_writer.go
diff --git a/reader_test.go b/reader_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/stretchr/testify/require"
-	mock_confluent "github.com/zillow/zkafka/mocks/confluent"
+	mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
 
 	"github.com/zillow/zfmt"
 	"go.uber.org/mock/gomock"

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
+	"github.com/zillow/zkafka/v2"
 	"golang.org/x/sync/errgroup"
 )
 

diff --git a/test/schema_registry_evo_test.go b/test/schema_registry_evo_test.go
@@ -17,13 +17,13 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
-	"github.com/zillow/zkafka"
-	"github.com/zillow/zkafka/test/evolution/avro1"
-	"github.com/zillow/zkafka/test/evolution/avro2"
-	"github.com/zillow/zkafka/test/evolution/json1"
-	"github.com/zillow/zkafka/test/evolution/json2"
-	"github.com/zillow/zkafka/test/evolution/proto1"
-	"github.com/zillow/zkafka/test/evolution/proto2"
+	"github.com/zillow/zkafka/v2"
+	"github.com/zillow/zkafka/v2/test/evolution/avro1"
+	"github.com/zillow/zkafka/v2/test/evolution/avro2"
+	"github.com/zillow/zkafka/v2/test/evolution/json1"
+	"github.com/zillow/zkafka/v2/test/evolution/json2"
+	"github.com/zillow/zkafka/v2/test/evolution/proto1"
+	"github.com/zillow/zkafka/v2/test/evolution/proto2"
 )
 
 // Test_SchemaRegistryReal_Avro_AutoRegisterSchemas_BackwardCompatibleSchemasCanBeRegisteredAndReadFrom tests

diff --git a/test/schema_registry_test.go b/test/schema_registry_test.go
@@ -13,11 +13,11 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
-	"github.com/zillow/zkafka/test/evolution/avro1"
-	avro1x "github.com/zillow/zkafka/test/evolution/avro1x"
-	"github.com/zillow/zkafka/test/evolution/json1"
-	"github.com/zillow/zkafka/test/evolution/proto1"
+	"github.com/zillow/zkafka/v2"
+	"github.com/zillow/zkafka/v2/test/evolution/avro1"
+	avro1x "github.com/zillow/zkafka/v2/test/evolution/avro1x"
+	"github.com/zillow/zkafka/v2/test/evolution/json1"
+	"github.com/zillow/zkafka/v2/test/evolution/proto1"
 )
 
 //go:embed evolution/schema_1.avsc

diff --git a/test/worker_test.go b/test/worker_test.go
@@ -16,8 +16,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
-	zkafka_mocks "github.com/zillow/zkafka/mocks"
+	"github.com/zillow/zkafka/v2"
+	zkafka_mocks "github.com/zillow/zkafka/v2/mocks"
 	"golang.org/x/sync/errgroup"
 
 	"go.uber.org/mock/gomock"

diff --git a/test/writer_test.go b/test/writer_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	"github.com/zillow/zkafka"
-	mock_confluent "github.com/zillow/zkafka/mocks/confluent"
+	"github.com/zillow/zkafka/v2"
+	mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
 	"go.uber.org/mock/gomock"
 )
 

diff --git a/work_test.go b/work_test.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/otel/trace/noop"
 
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
-	mock_confluent "github.com/zillow/zkafka/mocks/confluent"
+	mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
 	"go.uber.org/mock/gomock"
 )
 

diff --git a/writer_test.go b/writer_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
 	"github.com/stretchr/testify/require"
 	"github.com/zillow/zfmt"
-	mock_confluent "github.com/zillow/zkafka/mocks/confluent"
+	mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace/noop"