From b4266bf3645fd694f77a5e03a4f62892cceb2d3e Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 11:45:38 +0200 Subject: [PATCH 01/12] bump go version --- go.mod | 2 +- go.sum | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d92b880..e9a117b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/blendle/go-streamprocessor/v3 -go 1.12 +go 1.15 require ( github.com/confluentinc/confluent-kafka-go v1.1.0 diff --git a/go.sum b/go.sum index 9d7218e..5b5c549 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/confluentinc/confluent-kafka-go v1.0.0 h1:y+G9NTXsvoelf1cRzjtLKOZsPqh71noS4+t+e+eINIk= -github.com/confluentinc/confluent-kafka-go v1.0.0/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= github.com/confluentinc/confluent-kafka-go v1.1.0 h1:HIW7Nkm8IeKRotC34mGY06DwQMf9Mp9PZMyqDxid2wI= github.com/confluentinc/confluent-kafka-go v1.1.0/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From d0d607cb6e22028d905c447fd7d8d26897835fea Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 12:33:17 +0200 Subject: [PATCH 02/12] Update confluent Kafka --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e9a117b..1224224 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/blendle/go-streamprocessor/v3 go 1.15 require ( - github.com/confluentinc/confluent-kafka-go v1.1.0 + github.com/confluentinc/confluent-kafka-go v1.3.0 github.com/davecgh/go-spew v1.1.1 // indirect github.com/kelseyhightower/envconfig v0.0.0-20180517194557-dd1402a4d99d github.com/kr/pretty v0.1.0 // indirect diff --git a/go.sum b/go.sum index 5b5c549..83ebb4a 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/confluentinc/confluent-kafka-go v1.1.0 h1:HIW7Nkm8IeKRotC34mGY06DwQMf9Mp9PZMyqDxid2wI= -github.com/confluentinc/confluent-kafka-go v1.1.0/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= +github.com/confluentinc/confluent-kafka-go v1.3.0 h1:1gJm/SgUqG01jRYJ1pSZ9GldAhXZ0xrFPKxINlVZ3z0= +github.com/confluentinc/confluent-kafka-go v1.3.0/go.mod h1:MPUvNqmycSJrQZKGPS6LyLZLJH1hmLKkBmHQgQR7Ma0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From d8d82797d5dfb70778ef1a1dd67daa8e91258c9f Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 12:44:35 +0200 Subject: [PATCH 03/12] Update Go and librdkafka on travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b7af15..8cf134f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: go go: -- "1.12.9" +- "1.15.5" services: - docker @@ -18,7 +18,7 @@ cache: env: global: - GO111MODULE=on - - LIBRDKAFKA_VERSION=v1.1.0 + - LIBRDKAFKA_VERSION=v1.3.0 - PKG_CONFIG_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib/pkgconfig" - LD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" - DYLD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" From 2c318a5ab8a00c7c2aa8a183d0a31c34ad1f5dea Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 13:01:20 +0200 Subject: [PATCH 04/12] update linter version --- script/bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/bootstrap b/script/bootstrap index 6c0634b..4fba15c 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -29,5 +29,5 @@ if [ -n "$CI" ] || ! command -v shfmt >/dev/null 2>&1; then fi if [ -n "$CI" ] || ! command -v golangci-lint >/dev/null 2>&1; then - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)/bin" v1.17.1 + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)/bin" v1.38.0 fi From 7657db722c4adaeb5d46264c6508674311a2fc9d Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 14:34:08 +0200 Subject: [PATCH 05/12] remove deprecated errors --- streamconfig/kafkaconfig/consumer.go | 2 -- streamconfig/kafkaconfig/consumer_test.go | 2 -- streamconfig/kafkaconfig/producer.go | 2 -- streamconfig/kafkaconfig/producer_test.go | 2 -- 4 files changed, 8 deletions(-) diff --git a/streamconfig/kafkaconfig/consumer.go b/streamconfig/kafkaconfig/consumer.go index 8551c6f..a0a79f7 100644 --- a/streamconfig/kafkaconfig/consumer.go +++ b/streamconfig/kafkaconfig/consumer.go @@ -216,8 +216,6 @@ var ConsumerDefaults = Consumer{ kafka.ErrBrokerNotAvailable, kafka.ErrReplicaNotAvailable, kafka.ErrNetworkException, - kafka.ErrGroupCoordinatorNotAvailable, - kafka.ErrNotCoordinatorForGroup, kafka.ErrNotEnoughReplicas, kafka.ErrNotEnoughReplicasAfterAppend, kafka.ErrUnknownMemberID, diff --git a/streamconfig/kafkaconfig/consumer_test.go b/streamconfig/kafkaconfig/consumer_test.go index 3d24aaf..4134618 100644 --- a/streamconfig/kafkaconfig/consumer_test.go +++ b/streamconfig/kafkaconfig/consumer_test.go @@ -63,8 +63,6 @@ func TestConsumerDefaults(t *testing.T) { kafka.ErrBrokerNotAvailable, kafka.ErrReplicaNotAvailable, kafka.ErrNetworkException, - kafka.ErrGroupCoordinatorNotAvailable, - kafka.ErrNotCoordinatorForGroup, kafka.ErrNotEnoughReplicas, kafka.ErrNotEnoughReplicasAfterAppend, kafka.ErrUnknownMemberID, diff --git a/streamconfig/kafkaconfig/producer.go b/streamconfig/kafkaconfig/producer.go index 2ad52df..24c161e 100644 --- a/streamconfig/kafkaconfig/producer.go +++ b/streamconfig/kafkaconfig/producer.go @@ -163,8 +163,6 @@ var ProducerDefaults = Producer{ kafka.ErrBrokerNotAvailable, kafka.ErrReplicaNotAvailable, kafka.ErrNetworkException, - kafka.ErrGroupCoordinatorNotAvailable, - kafka.ErrNotCoordinatorForGroup, kafka.ErrNotEnoughReplicas, kafka.ErrNotEnoughReplicasAfterAppend, kafka.ErrUnknownMemberID, diff --git a/streamconfig/kafkaconfig/producer_test.go b/streamconfig/kafkaconfig/producer_test.go index 5cf65b7..a509442 100644 --- a/streamconfig/kafkaconfig/producer_test.go +++ b/streamconfig/kafkaconfig/producer_test.go @@ -64,8 +64,6 @@ func TestProducerDefaults(t *testing.T) { kafka.ErrBrokerNotAvailable, kafka.ErrReplicaNotAvailable, kafka.ErrNetworkException, - kafka.ErrGroupCoordinatorNotAvailable, - kafka.ErrNotCoordinatorForGroup, kafka.ErrNotEnoughReplicas, kafka.ErrNotEnoughReplicasAfterAppend, kafka.ErrUnknownMemberID, From 35201eabb6a3c6d1bfa5fbb45ad17b01f5978cfc Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 14:48:35 +0200 Subject: [PATCH 06/12] bump librdkafka to 1.4.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8cf134f..ea5fe58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: env: global: - GO111MODULE=on - - LIBRDKAFKA_VERSION=v1.3.0 + - LIBRDKAFKA_VERSION=v1.4.0 - PKG_CONFIG_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib/pkgconfig" - LD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" - DYLD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" From bfb489c2e3a0b99a4f6d1626766e5465dc7744c8 Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 15:13:43 +0200 Subject: [PATCH 07/12] bumb librdkafka to 1.4.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea5fe58..f609332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: env: global: - GO111MODULE=on - - LIBRDKAFKA_VERSION=v1.4.0 + - LIBRDKAFKA_VERSION=v1.4.2 - PKG_CONFIG_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib/pkgconfig" - LD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" - DYLD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" From 2e4560f2b0628af9dc74203c45e892a9a6cb6531 Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 15:23:58 +0200 Subject: [PATCH 08/12] bump librdkafka to 1.4.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1224224..f61eecd 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/blendle/go-streamprocessor/v3 go 1.15 require ( - github.com/confluentinc/confluent-kafka-go v1.3.0 + github.com/confluentinc/confluent-kafka-go v1.4.2 github.com/davecgh/go-spew v1.1.1 // indirect github.com/kelseyhightower/envconfig v0.0.0-20180517194557-dd1402a4d99d github.com/kr/pretty v0.1.0 // indirect diff --git a/go.sum b/go.sum index 83ebb4a..270b70c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/confluentinc/confluent-kafka-go v1.3.0 h1:1gJm/SgUqG01jRYJ1pSZ9GldAhXZ0xrFPKxINlVZ3z0= -github.com/confluentinc/confluent-kafka-go v1.3.0/go.mod h1:MPUvNqmycSJrQZKGPS6LyLZLJH1hmLKkBmHQgQR7Ma0= +github.com/confluentinc/confluent-kafka-go v1.4.2 h1:13EK9RTujF7lVkvHQ5Hbu6bM+Yfrq8L0MkJNnjHSd4Q= +github.com/confluentinc/confluent-kafka-go v1.4.2/go.mod h1:u2zNLny2xq+5rWeTQjFHbDzzNuba4P1vo31r9r4uAdg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From ff4ad0a290017fb0fe185de6c11f5980df3a1287 Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 15:46:35 +0200 Subject: [PATCH 09/12] bumb librdkafka to 1.5.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f609332..8494558 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: env: global: - GO111MODULE=on - - LIBRDKAFKA_VERSION=v1.4.2 + - LIBRDKAFKA_VERSION=v1.5.0 - PKG_CONFIG_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib/pkgconfig" - LD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" - DYLD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" From f1b4031152254df6a857f0e07b2e3237ac19702f Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 16:13:13 +0200 Subject: [PATCH 10/12] bump librdkafka to 1.5.2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8494558..79569ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ cache: env: global: - GO111MODULE=on - - LIBRDKAFKA_VERSION=v1.5.0 + - LIBRDKAFKA_VERSION=v1.5.2 - PKG_CONFIG_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib/pkgconfig" - LD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" - DYLD_LIBRARY_PATH="$GOPATH/src/github.com/blendle/go-streamprocessor/tmp-build/$LIBRDKAFKA_VERSION/lib" From 03d64fbad2c5130fffe9a8d576d9a6cf624aac12 Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 19:32:23 +0200 Subject: [PATCH 11/12] bump test kafka version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 02ada8e..89a4e70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: kafka: - image: wurstmeister/kafka:1.1.0 + image: wurstmeister/kafka:2.11-2.0.1 ports: - "9092:9092" environment: From eedf48a64f10337b9ac8e563f20a876b7539d8db Mon Sep 17 00:00:00 2001 From: Jasper Oosterman Date: Wed, 7 Apr 2021 19:48:31 +0200 Subject: [PATCH 12/12] bumb test kafka version --- docker-compose.yml | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 89a4e70..08dd053 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: kafka: - image: wurstmeister/kafka:2.11-2.0.1 + image: wurstmeister/kafka:2.12-2.2.0 ports: - "9092:9092" environment: diff --git a/go.sum b/go.sum index 270b70c..e1836b2 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,7 @@ github.com/kelseyhightower/envconfig v0.0.0-20180517194557-dd1402a4d99d h1:Tqg6y github.com/kelseyhightower/envconfig v0.0.0-20180517194557-dd1402a4d99d/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -16,6 +17,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/satori/go.uuid v0.0.0-20181016184021-8ccf5352a842 h1:FnHGUoRWCQGG7mgyYKfpi6DM0hamU/OhJ3KQwE9V4JY= github.com/satori/go.uuid v0.0.0-20181016184021-8ccf5352a842/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=