From 9d28ebce9158aea55b51d7ccc0b5a223e6c85ea2 Mon Sep 17 00:00:00 2001 From: Emil Haugbergsmyr Date: Wed, 11 Jan 2017 17:24:09 +0100 Subject: [PATCH] Fixes change in Kafka consumer input plugin (#2222) * Fixes change to the error api in the kafka project. * Updated test to reflect the change. * Update kafka to match master branch. --- Godeps | 2 +- plugins/inputs/kafka_consumer/kafka_consumer.go | 2 +- plugins/inputs/kafka_consumer/kafka_consumer_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Godeps b/Godeps index 6a0a17df1..885213c96 100644 --- a/Godeps +++ b/Godeps @@ -52,7 +52,7 @@ github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26 github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2 -github.com/wvanbergen/kafka 46f9a1cf3f670edec492029fadded9c2d9e18866 +github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8 github.com/yuin/gopher-lua bf3808abd44b1e55143a2d7f08571aaa80db1808 github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363 diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go index 52117759d..f4176edd3 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer.go @@ -33,7 +33,7 @@ type Kafka struct { // channel for all incoming kafka messages in <-chan *sarama.ConsumerMessage // channel for all kafka consumer errors - errs <-chan *sarama.ConsumerError + errs <-chan error done chan struct{} // keep the accumulator internally: diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go index 1777aa89e..c4936974f 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go @@ -27,7 +27,7 @@ func newTestKafka() (*Kafka, chan *sarama.ConsumerMessage) { Offset: "oldest", in: in, doNotCommitMsgs: true, - errs: make(chan *sarama.ConsumerError, 1000), + errs: make(chan error, 1000), done: make(chan struct{}), } return &k, in