From 6ac4b9822b5cf6238a9035a46c4b6aef58ecabd2 Mon Sep 17 00:00:00 2001 From: Rob Bavey Date: Mon, 11 Feb 2019 11:24:29 -0500 Subject: [PATCH] Backport of fixes from more recent branches: Fixed incorrect millisecond to second conversion for retry_backoff_ms #216 Fixed unnecessary sleep after exhausted retries #166 Changed Kafka send errors to log as warn #179 --- .travis.yml | 6 ++++-- CHANGELOG.md | 6 ++++++ kafka_test_setup.sh | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce6e007..0592b1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,10 @@ jdk: oraclejdk8 rvm: - jruby-1.7.25 env: - - KAFKA_VERSION=0.10.0.1 -before_install: ./kafka_test_setup.sh + - KAFKA_VERSION=0.10.2.2 +before_install: + - gem install bundler -v '< 2' + - ./kafka_test_setup.sh before_script: - bundle exec rake vendor script: bundle exec rspec && bundle exec rspec --tag integration diff --git a/CHANGELOG.md b/CHANGELOG.md index c23a609..3fcb468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 5.1.12 + - Backport of fixes from more recent branches: + - Fixed incorrect millisecond to second conversion for retry_backoff_ms [#216](https://github.com/logstash-plugins/logstash-output-kafka/pull/216) + - Fixed unnecessary sleep after exhausted retries [#166](https://github.com/logstash-plugins/logstash-output-kafka/pull/166) + - Changed Kafka send errors to log as warn [#179](https://github.com/logstash-plugins/logstash-output-kafka/pull/179) + ## 5.1.11 - Bugfix: Sends are now retried until successful. Previously, failed transmissions to Kafka could have been lost by the KafkaProducer library. Now we verify transmission explicitly. diff --git a/kafka_test_setup.sh b/kafka_test_setup.sh index 771fb17..b9abdfa 100755 --- a/kafka_test_setup.sh +++ b/kafka_test_setup.sh @@ -5,7 +5,7 @@ set -ex if [ -n "${KAFKA_VERSION+1}" ]; then echo "KAFKA_VERSION is $KAFKA_VERSION" else - KAFKA_VERSION=0.10.1.0 + KAFKA_VERSION=0.10.2.2 fi echo "Downloading Kafka version $KAFKA_VERSION"