diff --git a/.travis.yml b/.travis.yml index 4b7af15..79569ce 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.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" diff --git a/docker-compose.yml b/docker-compose.yml index 02ada8e..08dd053 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.12-2.2.0 ports: - "9092:9092" environment: diff --git a/go.mod b/go.mod index d92b880..f61eecd 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/blendle/go-streamprocessor/v3 -go 1.12 +go 1.15 require ( - github.com/confluentinc/confluent-kafka-go v1.1.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 9d7218e..e1836b2 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ -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/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= @@ -9,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= @@ -18,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= 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 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,