Skip to content

Commit 55438c3

Browse files
stewartboyd119stewartboyd119
authored
Updated github.com/golang/mock (deprecated) in favor of github.com/uber-go/mock (#17)
# Updated github.com/golang/mock (deprecated) in favor of github.com/uber-go/mock 1. Updated github.com/golang/mock (deprecated) in favor of github.com/uber-go/mock 2. Bugfixes in `WithDisableCircuitBreaker` and `WithDisableBusyLoopBreaker` options implementation
1 parent b18d47d commit 55438c3

34 files changed

+141
-132
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## Install
99

10-
`go get -u github.com/zillow/zkafka`
10+
`go get -u github.com/zillow/zkafka/v2`
1111

1212
## About
1313

‎changelog.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

55
This project adheres to Semantic Versioning.
66

7+
## 2.0.0 (October 17, 2024)
8+
9+
1. Removed dependency on github.com/golang/mock (deprecated) in favor of github.com/uber-go/mock
10+
2. Bugfixes in `WithDisableCircuitBreaker` and `WithDisableBusyLoopBreaker` options implementation
11+
712
## 1.3.0 (Sep 25, 2024)
813

914
1. Added `WithDisableCircuitBreaker` and `WithDisableBusyLoopBreaker` options. These are variants of the now deprecated `DisableCircuitBreaker`

‎client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ClientProvider interface {
2222
// static type checking for the convenient Writer interface
2323
var _ ClientProvider = (*Client)(nil)
2424

25-
const instrumentationName = "github.com/zillow/zkafka"
25+
const instrumentationName = "github.com/zillow/zkafka/v2"
2626

2727
// Client helps instantiate usable readers and writers
2828
type Client struct {

‎client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import (
1010
"time"
1111

1212
"github.com/confluentinc/confluent-kafka-go/v2/kafka"
13-
"github.com/golang/mock/gomock"
1413
"github.com/google/go-cmp/cmp"
1514
"github.com/google/go-cmp/cmp/cmpopts"
1615
"github.com/stretchr/testify/require"
1716
"github.com/zillow/zfmt"
18-
mock_confluent "github.com/zillow/zkafka/mocks/confluent"
17+
mock_confluent "github.com/zillow/zkafka/v2/mocks/confluent"
1918
"go.opentelemetry.io/otel/propagation"
2019
"go.opentelemetry.io/otel/trace"
2120
"go.opentelemetry.io/otel/trace/noop"
21+
"go.uber.org/mock/gomock"
2222
)
2323

2424
func TestNewClient(t *testing.T) {

‎coverage.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -x
66
# proto panics in such a situation. Setting this envvar ignores that check
77
export GOLANG_PROTOBUF_REGISTRATION_CONFLICT=ignore
88
# golang packages that will be used for either testing or will be assessed for coverage
9-
pck1=github.com/zillow/zkafka
9+
pck1=github.com/zillow/zkafka/v2
1010
pck2=$pck1/test
1111

1212
topdir=$(pwd)

‎example/producer/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/zillow/zfmt"
10-
"github.com/zillow/zkafka"
10+
"github.com/zillow/zkafka/v2"
1111
)
1212

1313
func main() {

‎example/producer_avro/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module github.com/zillow/zkafka/example/producer_avro
1+
module github.com/zillow/zkafka/v2/example/producer_avro
22

33
go 1.23.1
44

5-
replace github.com/zillow/zkafka v1.0.0 => ../..
5+
replace github.com/zillow/zkafka/v2 v2.0.0 => ../..
66

7-
require github.com/zillow/zkafka v1.0.0
7+
require github.com/zillow/zkafka/v2 v2.0.0
88

99
require (
1010
github.com/actgardner/gogen-avro/v10 v10.2.1 // indirect

‎example/producer_avro/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1
160160
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
161161
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
162162
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
163-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
164-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
163+
go.uber.org/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
164+
go.uber.org/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
165165
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
166166
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
167167
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=

‎example/producer_avro/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"math/rand"
88
"time"
99

10-
"github.com/zillow/zkafka"
10+
"github.com/zillow/zkafka/v2"
1111
)
1212

1313
//go:embed event.avsc

‎example/worker-deadletter/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"syscall"
1111
"time"
1212

13-
"github.com/zillow/zkafka"
13+
"github.com/zillow/zkafka/v2"
1414
)
1515

1616
// Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

‎example/worker-delay/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"syscall"
99
"time"
1010

11-
"github.com/zillow/zkafka"
11+
"github.com/zillow/zkafka/v2"
1212
)
1313

1414
// Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

‎example/worker/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
"github.com/zillow/zfmt"
12-
"github.com/zillow/zkafka"
12+
"github.com/zillow/zkafka/v2"
1313
)
1414

1515
// Demonstrates reading from a topic via the zkafka.Work struct which is more convenient, typically, than using the consumer directly

‎example/worker_avro/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
module github.com/zillow/zkafka/example/worker_avro
1+
module github.com/zillow/zkafka/v2/example/worker_avro
22

33
go 1.23.1
44

5-
replace github.com/zillow/zkafka v1.0.0 => ../..
5+
replace github.com/zillow/zkafka/v2 v2.0.0 => ../..
66

77
require (
88
github.com/google/uuid v1.6.0
9-
github.com/zillow/zkafka v1.0.0
9+
github.com/zillow/zkafka/v2 v2.0.0
1010
)
1111

1212
require (

‎example/worker_avro/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1
160160
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
161161
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
162162
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
163-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
164-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
163+
go.uber.org/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
164+
go.uber.org/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
165165
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
166166
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
167167
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=

‎example/worker_avro/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/google/uuid"
13-
"github.com/zillow/zkafka"
13+
"github.com/zillow/zkafka/v2"
1414
)
1515

1616
//go:embed event.avsc

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
module github.com/zillow/zkafka
1+
module github.com/zillow/zkafka/v2
22

33
go 1.23
44

55
require (
66
github.com/confluentinc/confluent-kafka-go/v2 v2.5.3
7-
github.com/golang/mock v1.6.0
87
github.com/google/go-cmp v0.6.0
98
github.com/google/uuid v1.6.0
109
github.com/hamba/avro/v2 v2.24.0
@@ -14,6 +13,7 @@ require (
1413
github.com/zillow/zfmt v1.0.1
1514
go.opentelemetry.io/otel v1.30.0
1615
go.opentelemetry.io/otel/trace v1.30.0
16+
go.uber.org/mock v0.4.0
1717
golang.org/x/sync v0.8.0
1818
google.golang.org/protobuf v1.34.2
1919
)

‎go.sum

-25
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1
161161
github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
162162
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
163163
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
164-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
165-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
166164
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
167165
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
168166
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -401,7 +399,6 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
401399
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
402400
github.com/xiatechs/jsonata-go v1.8.5 h1:m1NaokPKD6LPaTPRl674EQz5mpkJvM3ymjdReDEP6/A=
403401
github.com/xiatechs/jsonata-go v1.8.5/go.mod h1:yGEvviiftcdVfhSRhRSpgyTel89T58f+690iB0fp2Vk=
404-
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
405402
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
406403
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
407404
github.com/zillow/zfmt v1.0.1 h1:JLN5WaxoqqoEPUpVWer83uhXhDPAA2nZkfQqgKnWp+w=
@@ -442,46 +439,24 @@ go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lI
442439
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
443440
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
444441
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
445-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
446-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
447442
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
448443
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
449444
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
450445
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
451-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
452-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
453-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
454-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
455446
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
456447
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
457448
golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ=
458449
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
459-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
460-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
461450
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
462451
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
463-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
464-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
465-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
466-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
467-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
468452
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
469453
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
470-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
471454
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
472455
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
473-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
474-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
475456
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
476457
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
477458
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
478459
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
479-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
480-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
481-
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
482-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
483-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
484-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
485460
google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY=
486461
google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg=
487462
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=

‎mocks/confluent/kafka_consumer.go

+10-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mocks/confluent/kafka_producer.go

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mocks/kreader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package mock_zkafka
55
import (
66
"context"
77

8-
"github.com/zillow/zkafka"
8+
"github.com/zillow/zkafka/v2"
99
)
1010

1111
var (

‎mocks/kwriter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package mock_zkafka
55
import (
66
"context"
77

8-
"github.com/zillow/zkafka"
8+
"github.com/zillow/zkafka/v2"
99
)
1010

1111
var (

0 commit comments

Comments
 (0)